Browse Source

Fix field names for globals

Stan Hebben 6 years ago
parent
commit
533bd04700

+ 2
- 2
JavaIntegration/src/main/java/org/openzen/zencode/java/JavaNativeModule.java View File

167
 			String name = global.value().isEmpty() ? field.getName() : global.value();
167
 			String name = global.value().isEmpty() ? field.getName() : global.value();
168
 			FieldMember fieldMember = new FieldMember(CodePosition.NATIVE, definition, Modifiers.PUBLIC | Modifiers.STATIC, name, thisType, type, registry, Modifiers.PUBLIC, 0, null);
168
 			FieldMember fieldMember = new FieldMember(CodePosition.NATIVE, definition, Modifiers.PUBLIC | Modifiers.STATIC, name, thisType, type, registry, Modifiers.PUBLIC, 0, null);
169
 			definition.addMember(fieldMember);
169
 			definition.addMember(fieldMember);
170
-			JavaField javaField = new JavaField(jcls, name, getDescriptor(field.getType()));
170
+			JavaField javaField = new JavaField(jcls, field.getName(), getDescriptor(field.getType()));
171
 			compiled.setFieldInfo(fieldMember, javaField);
171
 			compiled.setFieldInfo(fieldMember, javaField);
172
 			compiled.setFieldInfo(fieldMember.autoGetter, javaField);
172
 			compiled.setFieldInfo(fieldMember.autoGetter, javaField);
173
 			globals.put(name, new ExpressionSymbol((position, scope) -> new StaticGetterExpression(CodePosition.BUILTIN, fieldMember.autoGetter.ref(thisType, GenericMapper.EMPTY))));
173
 			globals.put(name, new ExpressionSymbol((position, scope) -> new StaticGetterExpression(CodePosition.BUILTIN, fieldMember.autoGetter.ref(thisType, GenericMapper.EMPTY))));
185
 			definition.addMember(methodMember);
185
 			definition.addMember(methodMember);
186
 			
186
 			
187
 			boolean isGenericResult = methodMember.header.getReturnType().isGeneric();
187
 			boolean isGenericResult = methodMember.header.getReturnType().isGeneric();
188
-			compiled.setMethodInfo(methodMember, new JavaMethod(jcls, JavaMethod.Kind.STATIC, name, false, getMethodDescriptor(method), method.getModifiers(), isGenericResult));
188
+			compiled.setMethodInfo(methodMember, new JavaMethod(jcls, JavaMethod.Kind.STATIC, method.getName(), false, getMethodDescriptor(method), method.getModifiers(), isGenericResult));
189
 			globals.put(name, new ExpressionSymbol((position, scope) -> {
189
 			globals.put(name, new ExpressionSymbol((position, scope) -> {
190
 				TypeMembers members = scope.getTypeMembers(thisType);
190
 				TypeMembers members = scope.getTypeMembers(thisType);
191
 				return new PartialStaticMemberGroupExpression(position, scope, thisType.type, members.getGroup(name), StoredType.NONE);
191
 				return new PartialStaticMemberGroupExpression(position, scope, thisType.type, members.getGroup(name), StoredType.NONE);

Loading…
Cancel
Save