Merge pull request #33 from consultingwerk/SCL-3270

SCL-3270 : Finished implementation
consultingwerk · Jan 22, 2021 · 8b20359 · 8b20359
2 parents 9d9e450 + f02ec45
commit 8b20359
Show file tree

Hide file tree

Showing 21 changed files with 87,688 additions and 83,447 deletions.
diff --git a/build.number b/build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Fri Dec 18 09:48:52 CET 2020
-build.number=1199
+#Tue Jan 05 08:57:56 CET 2021
+build.number=1201
diff --git a/proparse.assemblies.zip b/proparse.assemblies.zip
diff --git a/proparse.jar b/proparse.jar
diff --git a/proparse.java.zip b/proparse.java.zip
diff --git a/proparse.net.dll b/proparse.net.dll
diff --git a/src/com/joanju/proparse/BaseTokenTypes.txt b/src/com/joanju/proparse/BaseTokenTypes.txt
@@ -1229,4 +1229,11 @@ PACKAGEPROTECTED=1231
 PACKAGEPRIVATE=1232
 EVENT_HANDLER=1233
 EVENT_HANDLER_CONTEXT=1234
-Last_Token_Number=1235
+PLUS_EQUAL = 1235
+MINUS_EQUAL = 1236
+DIVIDE_EQUAL = 1237
+MULTIPLY_EQUAL = 1238
+TRUE = 1239
+FALSE = 1240
+NULL = 1241
+Last_Token_Number = 1242
diff --git a/src/com/joanju/proparse/Lexer.java b/src/com/joanju/proparse/Lexer.java
@@ -128,6 +128,10 @@ ProToken nextToken() throws IOException {
 					// slash (division) can only be followed by whitespace or '('
 					// ...that's what I found empirically, anyway. (jag 2003/05/09)
 					return makeToken(SLASH);
+				} else if (currChar=='=') {
+					append();
+					getChar();
+					return makeToken(DIVIDE_EQUAL);
 				} else {
 					append();
 					getChar();
@@ -178,7 +182,14 @@ ProToken nextToken() throws IOException {
 				return makeToken(SEMI);
 			case '*':
 				getChar();
-				return makeToken(STAR);
+				if(currChar == '=') {
+					append();
+					getChar();
+					return makeToken(MULTIPLY_EQUAL);
+				}
+				else {
+					return makeToken(STAR);
+				}
 			case '?':
 				getChar();
 				return makeToken(UNKNOWNVALUE);
@@ -229,10 +240,24 @@ ProToken nextToken() throws IOException {
 
 			case '+':
 				getChar();
-				return plusMinusStart(PLUS);
+				if(currChar == '=') {
+					append();
+					getChar();
+					return makeToken(PLUS_EQUAL);
+				}
+				else {
+					return plusMinusStart(PLUS);
+				}
 			case '-':
 				getChar();
-				return plusMinusStart(MINUS);
+				if(currChar == '=') {
+					append();
+					getChar();
+					return makeToken(MINUS_EQUAL);
+				}
+				else {
+					return plusMinusStart(MINUS);
+				}
 
 			case '#':
 			case '|':

diff --git a/src/com/joanju/proparse/NodeTypes.java b/src/com/joanju/proparse/NodeTypes.java
@@ -596,6 +596,7 @@ public void writeXferSchema(DataXferStream out) throws IOException {}
 		add(DISPLAY, 4, "display", TI.KEYWORD | TI.RESERVED);
 		add(DISTINCT, 8, "distinct", TI.KEYWORD | TI.RESERVED);
 		add(DIVIDE, 0, "", TI.NO_FLAGS);
+		add(DIVIDE_EQUAL, 2, "/=", TI.NO_FLAGS);
 		add(DO, 2, "do", TI.KEYWORD | TI.RESERVED);
 		add(DOS, 3, "dos", TI.KEYWORD | TI.RESERVED);
 		add(DOT_COMMENT, 0, "", TI.NO_FLAGS);
@@ -969,6 +970,7 @@ public void writeXferSchema(DataXferStream out) throws IOException {}
 		add(MINIMUM, 3, "minimum", TI.KEYWORD | TI.MAY_BE_REGULAR_FUNC);
 		add(MINSIZE, 8, "min-size", TI.KEYWORD);
 		add(MINUS, 0, "", TI.NO_FLAGS);
+		add(MINUS_EQUAL, 2, "-=", TI.NO_FLAGS);
 		add(MINVALUE, 7, "min-value", TI.KEYWORD);
 		add(MODULO, 3, "modulo", TI.KEYWORD);
 		add(MONTH, 5, "month", TI.KEYWORD | TI.MAY_BE_REGULAR_FUNC);
@@ -979,6 +981,7 @@ public void writeXferSchema(DataXferStream out) throws IOException {}
 		add(MULTIPLE, 8, "multiple", TI.KEYWORD);
 		add(MULTIPLEKEY, 12, "multiple-key", TI.KEYWORD);
 		add(MULTIPLY, 0, "", TI.NO_FLAGS);
+		add(MULTIPLY_EQUAL, 2, "*=", TI.NO_FLAGS);
 		add(MUSTEXIST, 10, "must-exist", TI.KEYWORD);
 		add(Method_param_list, 0, "", TI.NO_FLAGS);
 		add(Method_parameter, 0, "", TI.NO_FLAGS);
@@ -1122,6 +1125,7 @@ public void writeXferSchema(DataXferStream out) throws IOException {}
 		add(PINNABLE, 8, "pinnable", TI.KEYWORD);
 		add(PIPE, 0, "", TI.NO_FLAGS);
 		add(PLUS, 0, "", TI.NO_FLAGS);
+		add(PLUS_EQUAL, 2, "+=", TI.NO_FLAGS);
 		add(PLUSMINUSSTART, 0, "", TI.NO_FLAGS);
 		add(PORTRAIT, 8, "portrait", TI.KEYWORD);
 		add(POSITION, 8, "position", TI.KEYWORD);