Fix recursion when methods return or accept a value of their defining class. Fixed bracket expressions with a postfix expression.

JavaIntegration/src/main/java/org/openzen/zencode/java/JavaNativeModule.java

@@ -14,7 +14,9 @@ import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.FunctionParameter;
@@ -42,6 +44,7 @@ import org.openzen.zenscript.codemodel.member.GetterMember;
 import org.openzen.zenscript.codemodel.member.MethodMember;
 import org.openzen.zenscript.codemodel.member.OperatorMember;
 import org.openzen.zenscript.codemodel.member.SetterMember;
+import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.partial.PartialStaticMemberGroupExpression;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
@@ -146,7 +149,6 @@ public class JavaNativeModule {
 			return definitionByClass.get(cls);
 		
 		HighLevelDefinition result = convertClass(cls);
-		definitionByClass.put(cls, result);
 		return result;
 	}
 	
@@ -253,6 +255,7 @@ public class JavaNativeModule {
 		
 		definition.typeParameters = typeParameters;
 		compiled.setClassInfo(definition, javaClass);
+		definitionByClass.put(cls, definition);
 		
 		StoredType thisType = new StoredType(registry.getForMyDefinition(definition), AutoStorageTag.INSTANCE);
 		for (Field field : cls.getDeclaredFields()) {

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpression.java

@@ -357,12 +357,6 @@ public abstract class ParsedExpression {
 					// try! can thus be used to convert from exception-based to result-based and vice versa
 					return new ParsedTryRethrowExpression(position, readUnaryExpression(position, parser, options));
 				}
-			case T_LESS:// bracket expression
-				parser.next();
-				if (parser.bracketParser == null)
-					throw new ParseException(position, "Bracket expression detected but no bracket parser present");
-				
-				return parser.bracketParser.parse(position, parser);
 			default:
 				return readPostfixExpression(position, parser, options);
 		}
@@ -558,6 +552,12 @@ public abstract class ParsedExpression {
 				parser.required(T_ACLOSE, "} expected");
 				return new ParsedMatchExpression(position, source, cases);
 			}
+			case T_LESS:// bracket expression
+				parser.next();
+				if (parser.bracketParser == null)
+					throw new ParseException(position, "Bracket expression detected but no bracket parser present");
+				
+				return parser.bracketParser.parse(position, parser);
 			default: {
 				IParsedType type = IParsedType.parse(parser);
 				if (type == null) {

ScriptingExample/scripts/integration.zs

@@ -20,3 +20,7 @@ something.dump();
 
 val objects = makeArray(5);
 printMany(objects);
+
+
+println(<test string>);
+println(<test string>.length);

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/TestClass.java

@@ -28,4 +28,9 @@ public class TestClass implements ZenCodeType {
 	public void dump() {
 		System.out.println("TestClass " + name);
 	}
+	
+	@Method
+	public TestClass wrap(String quotes) {
+		return new TestClass(quotes + name + quotes);
+	}
 }