Browse Source

Fixed NPE in FunctionHeader and Stackoverflow

kindlich 4 years ago
parent
commit
5b231b0574
No known key found for this signature in database

+ 4
- 6
CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/TypeMemberBuilder.java View File

284
 					new TypeParameter[] { mappedConstructorParameter },
284
 					new TypeParameter[] { mappedConstructorParameter },
285
 					VOID,
285
 					VOID,
286
 					null,
286
 					null,
287
-					null,
288
 					new FunctionParameter(registry.getArray(registry.getGeneric(mappedConstructorParameter), dimension), "original"),
287
 					new FunctionParameter(registry.getArray(registry.getGeneric(mappedConstructorParameter), dimension), "original"),
289
 					new FunctionParameter(registry.getFunction(mappedConstructorHeaderWithoutIndex), "projection"));
288
 					new FunctionParameter(registry.getFunction(mappedConstructorHeaderWithoutIndex), "projection"));
290
 			members.addConstructor(new ConstructorMember(
289
 			members.addConstructor(new ConstructorMember(
307
 					new TypeParameter[] { mappedConstructorParameter },
306
 					new TypeParameter[] { mappedConstructorParameter },
308
 					VOID,
307
 					VOID,
309
 					null,
308
 					null,
310
-					null,
311
 					new FunctionParameter(registry.getArray(registry.getGeneric(mappedConstructorParameter), dimension), "original"),
309
 					new FunctionParameter(registry.getArray(registry.getGeneric(mappedConstructorParameter), dimension), "original"),
312
 					new FunctionParameter(registry.getFunction(mappedConstructorHeaderWithIndex), "projection"));
310
 					new FunctionParameter(registry.getFunction(mappedConstructorHeaderWithIndex), "projection"));
313
 			constructor(definition, ARRAY_CONSTRUCTOR_PROJECTED_INDEXED, mappedConstructorFunctionWithIndex);
311
 			constructor(definition, ARRAY_CONSTRUCTOR_PROJECTED_INDEXED, mappedConstructorFunctionWithIndex);
388
 				registry.getOptional(valueType),
386
 				registry.getOptional(valueType),
389
 				null,
387
 				null,
390
 				FunctionParameter.NONE);
388
 				FunctionParameter.NONE);
391
-		FunctionHeader putHeader = new FunctionHeader(new TypeParameter[] { functionParameter }, VOID, null, null, new FunctionParameter(valueType));
389
+		FunctionHeader putHeader = new FunctionHeader(new TypeParameter[] { functionParameter }, VOID, null, new FunctionParameter(valueType));
392
 		FunctionHeader containsHeader = new FunctionHeader(new TypeParameter[] { functionParameter }, BOOL, null, FunctionParameter.NONE);
390
 		FunctionHeader containsHeader = new FunctionHeader(new TypeParameter[] { functionParameter }, BOOL, null, FunctionParameter.NONE);
393
 		
391
 		
394
 		ClassDefinition builtin = new ClassDefinition(BUILTIN, Module.BUILTIN, null, "", Modifiers.PUBLIC);
392
 		ClassDefinition builtin = new ClassDefinition(BUILTIN, Module.BUILTIN, null, "", Modifiers.PUBLIC);
1351
 				id);
1349
 				id);
1352
 	}
1350
 	}
1353
 	
1351
 	
1354
-	private void add(HighLevelDefinition definition, BuiltinID id, BasicTypeID operand, BasicTypeID result) {
1355
-		add(definition, id, operand, result);
1356
-	}
1352
+	////private void add(HighLevelDefinition definition, BuiltinID id, BasicTypeID operand, BasicTypeID result) {
1353
+	////	add(definition, id, operand, (TypeID) result);
1354
+	////}
1357
 	
1355
 	
1358
 	private void add(HighLevelDefinition definition, BuiltinID id, TypeID operand, TypeID result) {
1356
 	private void add(HighLevelDefinition definition, BuiltinID id, TypeID operand, TypeID result) {
1359
 		addOp(definition, id, operand, result).registerTo(members, TypeMemberPriority.SPECIFIED, null);
1357
 		addOp(definition, id, operand, result).registerTo(members, TypeMemberPriority.SPECIFIED, null);

Loading…
Cancel
Save