Merge pull request #27 from consultingwerk/feature/SCL-2991

SCL-2991
consultingwerk · May 2, 2020 · c663143 · c663143
2 parents e9aa507 + 6912832
commit c663143
Show file tree

Hide file tree

Showing 24 changed files with 99,658 additions and 99,388 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 /bin/
+
+prorefactor/temp/
diff --git a/build.number b/build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Sun Jul 29 11:25:08 CEST 2018
-build.number=1178
+#Sun May 03 01:34:35 CEST 2020
+build.number=1179
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
@@ -1225,4 +1225,6 @@ BUFFER_TENANT_NAME=1227
 TENANT=1228
 TENANT_WHERE=1229
 SKIP_GROUP_DUPLICATES=1230
-Last_Token_Number=1231
+PACKAGEPROTECTED=1231
+PACKAGEPRIVATE=1232
+Last_Token_Number=1233
diff --git a/src/com/joanju/proparse/NodeTypes.java b/src/com/joanju/proparse/NodeTypes.java
@@ -169,7 +169,9 @@ static boolean isMethodModifier(int type) {
 		switch(type) {
 			case PUBLIC:
 			case PROTECTED:
+			case PACKAGEPROTECTED:
 			case PRIVATE:
+			case PACKAGEPRIVATE:
 			case OVERRIDE:
 			case FINAL:
 				return true;
@@ -1088,6 +1090,8 @@ public void writeXferSchema(DataXferStream out) throws IOException {}
 		add(OUTPUT, 6, "output", TI.KEYWORD | TI.RESERVED);
 		add(OVERLAY, 7, "overlay", TI.KEYWORD | TI.RESERVED);
 		add(OVERRIDE, 8, "override", TI.KEYWORD);
+		add(PACKAGEPRIVATE, 15, "package-private", TI.KEYWORD);
+		add(PACKAGEPROTECTED, 17, "package-protected", TI.KEYWORD);
 		add(PAGE, 4, "page", TI.KEYWORD | TI.RESERVED);
 		add(PAGEBOTTOM, 8, "page-bottom", TI.KEYWORD | TI.RESERVED);
 		add(PAGED, 5, "paged", TI.KEYWORD);

diff --git a/src/com/joanju/proparse/ProEval.java b/src/com/joanju/proparse/ProEval.java
@@ -4112,6 +4112,24 @@ public final Object  year_fun(AST _t) throws RecognitionException {
 		"GETCODEPAGE",
 		"HEIGHTCHARS",
 		"HEIGHTPIXELS",
+		"TENANT_ID",
+		"TENANT_NAME",
+		"TENANT_NAME_TO_ID",
+		"GET_EFFECTIVE_TENANT_NAME",
+		"GET_EFFECTIVE_TENANT_ID",
+		"NON_SERIALIZABLE",
+		"SET_EFFECTIVE_TENANT",
+		"IS_DB_MULTI_TENANT",
+		"BUFFER_GROUP_ID",
+		"BUFFER_GROUP_NAME",
+		"BUFFER_PARTITION_ID",
+		"BUFFER_TENANT_ID",
+		"BUFFER_TENANT_NAME",
+		"TENANT",
+		"TENANT_WHERE",
+		"SKIP_GROUP_DUPLICATES",
+		"PACKAGEPROTECTED",
+		"PACKAGEPRIVATE",
 		"Last_Token_Number"
 	};