Fixup names

adsharma · adsharma · commit ec8ee44dd9db · 2021-08-09T22:56:38.000-07:00
diff --git a/java2python/compiler/__init__.py b/java2python/compiler/__init__.py
@@ -22,10 +22,10 @@ def buildAST(source):
 
 def buildJavaDocAST(source):
     """ Returns an AST for the given javadoc source. """
-    from java2python.lang.JavaDocLexer import JavaDocLexer
-    from java2python.lang.JavaDocParser import JavaDocParser
-    lexer = JavaDocLexer(StringStream(source))
-    parser = JavaDocParser(TokenStream(lexer))
+    from java2python.lang.JavadocLexer import JavadocLexer
+    from java2python.lang.JavadocParser import JavaDocParser
+    lexer = JavadocLexer(StringStream(source))
+    parser = JavadocParser(TokenStream(lexer))
     scope = parser.commentBody()
     return scope.tree
 
diff --git a/java2python/lang/__init__.py b/java2python/lang/__init__.py
@@ -4,6 +4,6 @@
 #
 # Clients should import values from this module instead of our submodules.
 
-from java2python.lang.JavaLexer import JavaLexer as Lexer
-from java2python.lang.JavaParser import JavaParser as Parser
+from java2python.lang.Java9Lexer import Java9Lexer as Lexer
+from java2python.lang.Java9Parser import JavaParser as Parser
 from java2python.lang.base import StringStream, TokenStream, TreeAdaptor, tokens
diff --git a/java2python/lang/base.py b/java2python/lang/base.py
@@ -99,7 +99,7 @@ def module(self):
         module = self.parserModule
         if module:
             return module
-        import java2python.lang.JavaParser as module
+        import java2python.lang.Java9Parser as module
         self.parserModule = module
         return module
 

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`#`
`5`	`5`	`# Clients should import values from this module instead of our submodules.`
`6`	`6`
`7`		`-from java2python.lang.JavaLexer import JavaLexer as Lexer`
`8`		`-from java2python.lang.JavaParser import JavaParser as Parser`
	`7`	`+from java2python.lang.Java9Lexer import Java9Lexer as Lexer`
	`8`	`+from java2python.lang.Java9Parser import JavaParser as Parser`
`9`	`9`	`from java2python.lang.base import StringStream, TokenStream, TreeAdaptor, tokens`