소스 검색

added actual new java 1.9 language feature module/requires/provides/export

Dr. Michael Petter 7 년 전
부모
커밋
d85d30a39f

+ 10 - 3
jplag.frontend.java-1.9/src/main/java/jplag/java19/JavaTokenConstants.java

@@ -3,8 +3,7 @@ package jplag.java19;
 public interface JavaTokenConstants extends jplag.TokenConstants {
 	final static int FILE_END = 0;
 
-	// Used to optionally separate methods from each other
-	// with an always marked token (for 1.5 grammar)
+	// check used to mark tokens that are actually generated by the adapter
 	final static int SEPARATOR_TOKEN = 1;// @formatter:off
 
 	final static int J_PACKAGE = 2;				// check
@@ -71,6 +70,14 @@ public interface JavaTokenConstants extends jplag.TokenConstants {
 
 	// new in 1.7
 	final static int J_TRY_WITH_RESOURCE = 60; 	// check
+	
+	// new in 1.9
+	final static int J_REQUIRES = 61; 	       // check
+	final static int J_PROVIDES = 62; 	       // check
+	final static int J_EXPORTS  = 63; 	       // check
+	final static int J_MODULE_BEGIN  = 64;     // check
+	final static int J_MODULE_END  = 65; 	       // check
+	
 
-	final static int NUM_DIFF_TOKENS = 61;		// @formatter:on
+	final static int NUM_DIFF_TOKENS = 66;		// @formatter:on
 }

+ 31 - 0
jplag.frontend.java-1.9/src/main/java/jplag/java19/JavacAdapter.java

@@ -22,15 +22,19 @@ import com.sun.source.tree.ConditionalExpressionTree;
 import com.sun.source.tree.ContinueTree;
 import com.sun.source.tree.DoWhileLoopTree;
 import com.sun.source.tree.EnhancedForLoopTree;
+import com.sun.source.tree.ExportsTree;
 import com.sun.source.tree.ForLoopTree;
 import com.sun.source.tree.IfTree;
 import com.sun.source.tree.ImportTree;
 import com.sun.source.tree.LineMap;
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.tree.MethodTree;
+import com.sun.source.tree.ModuleTree;
 import com.sun.source.tree.NewArrayTree;
 import com.sun.source.tree.NewClassTree;
 import com.sun.source.tree.PackageTree;
+import com.sun.source.tree.ProvidesTree;
+import com.sun.source.tree.RequiresTree;
 import com.sun.source.tree.ReturnTree;
 import com.sun.source.tree.SwitchTree;
 import com.sun.source.tree.SynchronizedTree;
@@ -304,6 +308,33 @@ public class JavacAdapter {
 					parser.add(JavaTokenConstants.J_ANNO,filename,map.getLineNumber(n),map.getColumnNumber(n),1);
 					return super.visitAnnotation(node, p);
 				}
+				@Override
+				public Object visitModule(ModuleTree node, Object p) {
+					long n = positions.getStartPosition(ast, node);
+					long m = positions.getEndPosition(ast, node);
+					parser.add(JavaTokenConstants.J_MODULE_BEGIN,filename,map.getLineNumber(n),map.getColumnNumber(n),6);
+					Object ret =  super.visitModule(node, p);
+					parser.add(JavaTokenConstants.J_MODULE_END,filename,map.getLineNumber(m-1),map.getColumnNumber(m-1),1);
+					return ret;
+				}
+				@Override
+				public Object visitRequires(RequiresTree node, Object p) {
+					long n = positions.getStartPosition(ast, node);
+					parser.add(JavaTokenConstants.J_REQUIRES,filename,map.getLineNumber(n),map.getColumnNumber(n),8);
+					return super.visitRequires(node, p);
+				}
+				@Override
+				public Object visitProvides(ProvidesTree node, Object p) {
+					long n = positions.getStartPosition(ast, node);
+					parser.add(JavaTokenConstants.J_PROVIDES,filename,map.getLineNumber(n),map.getColumnNumber(n),8);
+					return super.visitProvides(node, p);
+				}
+				@Override
+				public Object visitExports(ExportsTree node, Object p) {
+					long n = positions.getStartPosition(ast, node);
+					parser.add(JavaTokenConstants.J_EXPORTS,filename,map.getLineNumber(n),map.getColumnNumber(n),7);
+					return super.visitExports(node, p);
+				}
 			}, null);
 			long n = positions.getEndPosition(last, last);
 			parser.add(JavaTokenConstants.FILE_END,filename,1,-1,-1);