Merge remote-tracking branch 'Stan/development' into development

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/builtin/StringConcatMember.java

@@ -1,91 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.openzen.zenscript.codemodel.member.builtin;
-
-import java.util.Map;
-import org.openzen.zenscript.codemodel.CompareType;
-import org.openzen.zenscript.codemodel.FunctionHeader;
-import org.openzen.zenscript.codemodel.OperatorType;
-import org.openzen.zenscript.codemodel.expression.CallArguments;
-import org.openzen.zenscript.codemodel.expression.Expression;
-import org.openzen.zenscript.codemodel.expression.StringConcatExpression;
-import org.openzen.zenscript.codemodel.generic.TypeParameter;
-import org.openzen.zenscript.codemodel.member.ICallableMember;
-import org.openzen.zenscript.codemodel.member.IDefinitionMember;
-import org.openzen.zenscript.codemodel.member.MemberVisitor;
-import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
-import org.openzen.zenscript.codemodel.type.ITypeID;
-import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
-import org.openzen.zenscript.codemodel.type.member.TypeMembers;
-import org.openzen.zenscript.shared.CodePosition;
-import org.openzen.zenscript.shared.Taggable;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public class StringConcatMember extends Taggable implements ICallableMember {
-	private final FunctionHeader header;
-	
-	public StringConcatMember(FunctionHeader header) {
-		this.header = header;
-	}
-	
-	@Override
-	public boolean isStatic() {
-		return false;
-	}
-
-	@Override
-	public FunctionHeader getHeader() {
-		return header;
-	}
-
-	@Override
-	public Expression call(CodePosition position, Expression target, FunctionHeader instancedHeader, CallArguments arguments) {
-		return new StringConcatExpression(position, target, arguments.arguments[0]);
-	}
-
-	@Override
-	public Expression callWithComparator(CodePosition position, CompareType operator, Expression target, FunctionHeader instancedHeader, CallArguments arguments) {
-		throw new UnsupportedOperationException("Not comparable");
-	}
-
-	@Override
-	public Expression callStatic(CodePosition position, FunctionHeader instancedHeader, CallArguments arguments) {
-		throw new UnsupportedOperationException("Not static");
-	}
-
-	@Override
-	public Expression callStaticWithComparator(CodePosition position, CompareType operator, FunctionHeader instancedHeader, CallArguments arguments) {
-		throw new UnsupportedOperationException("Not comparable");
-	}
-
-	@Override
-	public CodePosition getPosition() {
-		return CodePosition.BUILTIN;
-	}
-
-	@Override
-	public String describe() {
-		return "concat string";
-	}
-
-	@Override
-	public void registerTo(TypeMembers type, TypeMemberPriority priority) {
-		type.addOperator(OperatorType.CAT, this, priority);
-	}
-
-	@Override
-	public IDefinitionMember instance(GlobalTypeRegistry registry, Map<TypeParameter, ITypeID> mapping) {
-		return this; // only used for basic types
-	}
-
-	@Override
-	public <T> T accept(MemberVisitor<T> visitor) {
-		throw new UnsupportedOperationException("Not a compilable member");
-	}
-}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/TypeMemberBuilder.java

@@ -38,7 +38,6 @@ import org.openzen.zenscript.codemodel.member.builtin.ArrayIteratorValues;
 import org.openzen.zenscript.codemodel.member.builtin.ComparatorMember;
 import org.openzen.zenscript.codemodel.member.builtin.ConstantGetterMember;
 import org.openzen.zenscript.codemodel.member.builtin.RangeIterator;
-import org.openzen.zenscript.codemodel.member.builtin.StringConcatMember;
 import org.openzen.zenscript.codemodel.member.builtin.SubstringMember;
 import org.openzen.zenscript.codemodel.type.ArrayTypeID;
 import org.openzen.zenscript.codemodel.type.AssocTypeID;
@@ -82,6 +81,7 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 				break;
 			case BYTE:
 				visitByte();
+				break;
 			case INT:
 				visitInt();
 				break;
@@ -271,7 +271,6 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 	
 	private void visitBool() {
 		members.addOperator(BuiltinTypeMembers.BOOL_NOT);
-		members.addOperator(new OperatorMember(BUILTIN, 0, OperatorType.NOT, new FunctionHeader(BOOL)), TypeMemberPriority.SPECIFIED);
 	}
 	
 	private void visitByte() {
@@ -416,8 +415,10 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		members.addOperator(OperatorType.INDEXGET, new SubstringMember(substringHeader), TypeMemberPriority.SPECIFIED);
 		
 		members.addConstructor(new ConstructorMember(BUILTIN, 0, new FunctionHeader(VOID, new FunctionParameter(cache.getRegistry().getArray(CHAR, 1), "characters"))), TypeMemberPriority.SPECIFIED);
+		
+		members.addOperator(STRING_ADD_STRING);
 
-		registerStringConcat(NULL);
+		/*registerStringConcat(NULL);
 		registerStringConcat(BOOL);
 		registerStringConcat(SBYTE);
 		registerStringConcat(BYTE);
@@ -430,12 +431,11 @@ public class TypeMemberBuilder implements ITypeVisitor<Void> {
 		registerStringConcat(FLOAT);
 		registerStringConcat(DOUBLE);
 		registerStringConcat(CHAR);
-		registerStringConcat(STRING);
+		registerStringConcat(STRING);*/
 	}
 
 	private void registerStringConcat(ITypeID withType) {
-		FunctionHeader header = new FunctionHeader(STRING, new FunctionParameter(withType));
-		members.addOperator(OperatorType.CAT, new StringConcatMember(header), TypeMemberPriority.SPECIFIED);
+		members.addOperator(STRING_ADD_STRING);
 	}
 
 	private void registerUnaryOperations() {

ScriptingExample/scripts/statements.zs

@@ -0,0 +1,2 @@
+while true
+	println("Hello!");