refactor frontend packages

paulzfm · paulzfm · commit 9e78b4ed7ecc · 2019-09-23T02:42:15.000+08:00
diff --git a/build.sbt b/build.sbt
@@ -22,7 +22,7 @@ libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.9"
 
 enablePlugins(Antlr4Plugin)
 
-antlr4PackageName in Antlr4 := Some("decaf.parsing.antlr")
+antlr4PackageName in Antlr4 := Some("decaf.frontend.parsing.antlr")
 
 antlr4GenListener in Antlr4 := false // default: true
 
diff --git a/src/main/scala/decaf/driver/Phase.scala b/src/main/scala/decaf/driver/Phase.scala
@@ -2,7 +2,7 @@ package decaf.driver
 
 import java.io.PrintStream
 
-import decaf.error.ErrorIssuer
+import decaf.driver.error.ErrorIssuer
 
 abstract class Phase[In, Out](val name: String) extends ErrorIssuer {
   def transform(input: In): Out
diff --git a/src/main/scala/decaf/driver/Tasks.scala b/src/main/scala/decaf/driver/Tasks.scala
@@ -4,10 +4,10 @@ import java.io.InputStream
 
 import decaf.jvm.{JVMClass, JVMGen}
 import decaf.lowlevel.tac.TacProg
-import decaf.parsing.Parser
-import decaf.tac.TacGen
-import decaf.tree.TypedTree
-import decaf.typecheck.{Namer, Typer}
+import decaf.frontend.parsing.Parser
+import decaf.frontend.tac.TacGen
+import decaf.frontend.tree.TypedTree
+import decaf.frontend.typecheck.{Namer, Typer}
 
 class Tasks(implicit val opt: Config) {
 
diff --git a/src/main/scala/decaf/driver/error/ErrorIssuer.scala b/src/main/scala/decaf/driver/error/ErrorIssuer.scala
@@ -1,4 +1,4 @@
-package decaf.error
+package decaf.driver.error
 
 import java.io.PrintStream
 
diff --git a/src/main/scala/decaf/driver/error/Errors.scala b/src/main/scala/decaf/driver/error/Errors.scala
@@ -1,7 +1,7 @@
-package decaf.error
+package decaf.driver.error
 
-import decaf.annot.{ClassType, Type}
-import decaf.parsing.{NoPos, Pos}
+import decaf.frontend.annot.{ClassType, Type}
+import decaf.frontend.parsing.{NoPos, Pos}
 
 abstract class Error(val msg: String, val pos: Pos = NoPos) extends Exception {
   override def toString: String = pos match {
diff --git a/src/main/scala/decaf/driver/error/RuntimeError.scala b/src/main/scala/decaf/driver/error/RuntimeError.scala
@@ -1,4 +1,4 @@
-package decaf.error
+package decaf.driver.error
 
 object RuntimeError {
   final val ARRAY_INDEX_OUT_OF_BOUND = "Decaf runtime error: Array subscript out of bounds\n"
diff --git a/src/main/scala/decaf/frontend/annot/Annot.scala b/src/main/scala/decaf/frontend/annot/Annot.scala
@@ -1,4 +1,4 @@
-package decaf.annot
+package decaf.frontend.annot
 
 /**
   * An "annotation" is something that is labeled on a tree node.
diff --git a/src/main/scala/decaf/frontend/annot/Scope.scala b/src/main/scala/decaf/frontend/annot/Scope.scala
@@ -1,6 +1,6 @@
-package decaf.annot
+package decaf.frontend.annot
 
-import decaf.parsing.Pos
+import decaf.frontend.parsing.Pos
 
 import scala.collection.mutable
 
diff --git a/src/main/scala/decaf/frontend/annot/Symbol.scala b/src/main/scala/decaf/frontend/annot/Symbol.scala
@@ -1,12 +1,12 @@
-package decaf.annot
+package decaf.frontend.annot
 
 import java.util.TreeSet
 
 import decaf.lowlevel.tac.ClassInfo
-import decaf.parsing.Pos
-import decaf.tree.SyntaxTree
-import decaf.tree.SyntaxTree._
-import decaf.tree.TreeNode.Var
+import decaf.frontend.parsing.Pos
+import decaf.frontend.tree.SyntaxTree
+import decaf.frontend.tree.SyntaxTree._
+import decaf.frontend.tree.TreeNode.Var
 import decaf.util.Conversions._
 
 /**
diff --git a/src/main/scala/decaf/frontend/annot/Type.scala b/src/main/scala/decaf/frontend/annot/Type.scala
@@ -1,4 +1,4 @@
-package decaf.annot
+package decaf.frontend.annot
 
 /**
   * Types.
diff --git a/src/main/scala/decaf/frontend/parsing/Lexer.scala b/src/main/scala/decaf/frontend/parsing/Lexer.scala
@@ -1,7 +1,7 @@
-package decaf.parsing
+package decaf.frontend.parsing
 
-import decaf.error.UnrecogCharError
-import decaf.parsing.antlr.DecafLexer
+import decaf.driver.error.UnrecogCharError
+import decaf.frontend.parsing.antlr.DecafLexer
 import org.antlr.v4.runtime.{CharStream, Token}
 
 /**
diff --git a/src/main/scala/decaf/frontend/parsing/Parser.scala b/src/main/scala/decaf/frontend/parsing/Parser.scala
@@ -1,16 +1,16 @@
-package decaf.parsing
+package decaf.frontend.parsing
 
 import java.io.InputStream
 
 import decaf.driver.{Config, Phase}
-import decaf.error._
+import decaf.driver.error._
 import decaf.lowlevel.log.IndentPrinter
-import decaf.parsing.Util._
-import decaf.parsing.antlr.{DecafParser, DecafParserBaseVisitor}
+import decaf.frontend.parsing.Util._
+import decaf.frontend.parsing.antlr.{DecafParser, DecafParserBaseVisitor}
 import decaf.printing.PrettyTree
-import decaf.tree.SyntaxTree._
-import decaf.tree.TreeNode
-import decaf.tree.TreeNode.{Id, Modifiers}
+import decaf.frontend.tree.SyntaxTree._
+import decaf.frontend.tree.TreeNode
+import decaf.frontend.tree.TreeNode.{Id, Modifiers}
 import org.antlr.v4.runtime._
 
 import scala.jdk.CollectionConverters._
@@ -28,7 +28,7 @@ class Parser extends Phase[InputStream, Tree]("parser") {
     */
   override def transform(in: InputStream): Tree = {
     val stream = CharStreams.fromStream(in)
-    val lexer = new decaf.parsing.Lexer(stream)
+    val lexer = new decaf.frontend.parsing.Lexer(stream)
     val tokens = new CommonTokenStream(lexer)
     val parser = new DecafParser(tokens)
     parser.addErrorListener(ErrorListener)
diff --git a/src/main/scala/decaf/frontend/parsing/Pos.scala b/src/main/scala/decaf/frontend/parsing/Pos.scala
@@ -1,4 +1,4 @@
-package decaf.parsing
+package decaf.frontend.parsing
 
 /**
   * A position, say a line number and a column number in a source file.
diff --git a/src/main/scala/decaf/frontend/parsing/Util.scala b/src/main/scala/decaf/frontend/parsing/Util.scala
@@ -1,6 +1,6 @@
-package decaf.parsing
+package decaf.frontend.parsing
 
-import decaf.tree.SyntaxTree.{Block, Stmt}
+import decaf.frontend.tree.SyntaxTree.{Block, Stmt}
 import org.antlr.v4.runtime.{ParserRuleContext, Token}
 
 object Util {
diff --git a/src/main/scala/decaf/frontend/tac/TacEmitter.scala b/src/main/scala/decaf/frontend/tac/TacEmitter.scala
@@ -1,15 +1,15 @@
-package decaf.tac
+package decaf.frontend.tac
 
 
-import decaf.annot.SymbolImplicit._
-import decaf.annot.TypeImplicit._
-import decaf.annot.{BoolType, IntType, LocalVarSymbol, StringType}
+import decaf.frontend.annot.SymbolImplicit._
+import decaf.frontend.annot.TypeImplicit._
+import decaf.frontend.annot.{BoolType, IntType, LocalVarSymbol, StringType}
 import decaf.lowlevel.StringUtils
 import decaf.lowlevel.instr.Temp
 import decaf.lowlevel.label.Label
 import decaf.lowlevel.tac.{FuncVisitor, Intrinsic, RuntimeError, TacInstr}
-import decaf.tree.TreeNode
-import decaf.tree.TypedTree._
+import decaf.frontend.tree.TreeNode
+import decaf.frontend.tree.TypedTree._
 import decaf.util.Conversions._
 
 import scala.collection.mutable
diff --git a/src/main/scala/decaf/frontend/tac/TacGen.scala b/src/main/scala/decaf/frontend/tac/TacGen.scala
@@ -1,11 +1,11 @@
-package decaf.tac
+package decaf.frontend.tac
 
 import java.io.PrintWriter
 
-import decaf.annot.SymbolImplicit._
+import decaf.frontend.annot.SymbolImplicit._
 import decaf.driver.{Config, Phase}
 import decaf.lowlevel.tac.{ProgramWriter, Simulator, TacProg}
-import decaf.tree.TypedTree._
+import decaf.frontend.tree.TypedTree._
 import decaf.util.Conversions._
 
 /**
diff --git a/src/main/scala/decaf/frontend/tree/SyntaxTree.scala b/src/main/scala/decaf/frontend/tree/SyntaxTree.scala
@@ -1,7 +1,7 @@
-package decaf.tree
+package decaf.frontend.tree
 
-import decaf.annot.Annot
-import decaf.tree.TreeNode.Id
+import decaf.frontend.annot.Annot
+import decaf.frontend.tree.TreeNode.Id
 
 /**
   * A syntax tree, with no annotations.
diff --git a/src/main/scala/decaf/frontend/tree/TreeNode.scala b/src/main/scala/decaf/frontend/tree/TreeNode.scala
@@ -1,6 +1,6 @@
-package decaf.tree
+package decaf.frontend.tree
 
-import decaf.parsing.{NoPos, Pos, Positional}
+import decaf.frontend.parsing.{NoPos, Pos, Positional}
 
 object TreeNode {
 
diff --git a/src/main/scala/decaf/frontend/tree/TreeTmpl.scala b/src/main/scala/decaf/frontend/tree/TreeTmpl.scala
@@ -1,8 +1,8 @@
-package decaf.tree
+package decaf.frontend.tree
 
-import decaf.annot.{Annot, Annotated}
-import decaf.parsing.{NoPos, Pos}
-import decaf.tree.TreeNode._
+import decaf.frontend.annot.{Annot, Annotated}
+import decaf.frontend.parsing.{NoPos, Pos}
+import decaf.frontend.tree.TreeNode._
 
 /**
   * A template trait for expression a tree in high-level -- details of method bodies are not stated in this template,
diff --git a/src/main/scala/decaf/frontend/tree/TypedTree.scala b/src/main/scala/decaf/frontend/tree/TypedTree.scala
@@ -1,10 +1,10 @@
-package decaf.tree
+package decaf.frontend.tree
 
-import decaf.annot._
+import decaf.frontend.annot._
 
 /**
   * Compared to the NamedTree, a TypedTree is fully resolved and:
-  * - Every type literal is labeled with the actual type (i.e. of type `decaf.annot.Type`)
+  * - Every type literal is labeled with the actual type (i.e. of type `decaf.frontend.annot.Type`)
   * - Every expression is labeled with its type
   * - Every statement is type checked
   * - Every reference (e.g. refers a class, method, local variable) is linked to a symbol of the element that it points
diff --git a/src/main/scala/decaf/frontend/typecheck/Namer.scala b/src/main/scala/decaf/frontend/typecheck/Namer.scala
@@ -1,13 +1,13 @@
-package decaf.typecheck
+package decaf.frontend.typecheck
 
-import decaf.annot.SymbolImplicit._
-import decaf.annot.TypeImplicit._
-import decaf.annot._
+import decaf.frontend.annot.SymbolImplicit._
+import decaf.frontend.annot.TypeImplicit._
+import decaf.frontend.annot._
 import decaf.driver.Phase
-import decaf.error._
-import decaf.tree.SyntaxTree._
-import decaf.tree.TreeNode._
-import decaf.tree.{TypedTree => Typed}
+import decaf.driver.error._
+import decaf.frontend.tree.SyntaxTree._
+import decaf.frontend.tree.TreeNode._
+import decaf.frontend.tree.{TypedTree => Typed}
 
 import scala.collection.mutable
 
diff --git a/src/main/scala/decaf/frontend/typecheck/Typer.scala b/src/main/scala/decaf/frontend/typecheck/Typer.scala
@@ -1,18 +1,18 @@
-package decaf.typecheck
+package decaf.frontend.typecheck
 
-import decaf.annot.ScopeImplicit._
-import decaf.annot.SymbolImplicit._
-import decaf.annot.TypeImplicit._
-import decaf.annot._
+import decaf.frontend.annot.ScopeImplicit._
+import decaf.frontend.annot.SymbolImplicit._
+import decaf.frontend.annot.TypeImplicit._
+import decaf.frontend.annot._
 import decaf.driver.{Config, Phase}
-import decaf.error._
+import decaf.driver.error._
 import decaf.lowlevel.log.IndentPrinter
-import decaf.parsing.Pos
+import decaf.frontend.parsing.Pos
 import decaf.printing.PrettyScope
-import decaf.tree.SyntaxTree.NoAnnot
-import decaf.tree.TreeNode._
-import decaf.tree.TypedTree._
-import decaf.tree.{SyntaxTree => Syn}
+import decaf.frontend.tree.SyntaxTree.NoAnnot
+import decaf.frontend.tree.TreeNode._
+import decaf.frontend.tree.TypedTree._
+import decaf.frontend.tree.{SyntaxTree => Syn}
 
 /**
   * Type check. This phase inputs a SyntaxTree and outputs a TypedTree. In detail, we split this in two passes --
diff --git a/src/main/scala/decaf/frontend/typecheck/Util.scala b/src/main/scala/decaf/frontend/typecheck/Util.scala
@@ -1,10 +1,10 @@
-package decaf.typecheck
+package decaf.frontend.typecheck
 
-import decaf.annot.TypeImplicit._
-import decaf.annot._
-import decaf.error._
-import decaf.tree.SyntaxTree._
-import decaf.tree.{TypedTree => Typed}
+import decaf.frontend.annot.TypeImplicit._
+import decaf.frontend.annot._
+import decaf.driver.error._
+import decaf.frontend.tree.SyntaxTree._
+import decaf.frontend.tree.{TypedTree => Typed}
 
 trait Util extends ErrorIssuer {
   def typeTypeLit(typeLit: TypeLit)(implicit ctx: ScopeContext): Typed.TypeLit = {
diff --git a/src/main/scala/decaf/jvm/JVMGen.scala b/src/main/scala/decaf/jvm/JVMGen.scala
@@ -1,12 +1,12 @@
 package decaf.jvm
 
-import decaf.annot.SymbolImplicit._
-import decaf.annot.TypeImplicit._
-import decaf.annot.{ArrayType, JNativeType, LocalVarSymbol}
+import decaf.frontend.annot.SymbolImplicit._
+import decaf.frontend.annot.TypeImplicit._
+import decaf.frontend.annot.{ArrayType, JNativeType, LocalVarSymbol}
 import decaf.driver.{Config, Phase}
-import decaf.tree.TreeNode.{ArithOp, EqOrCmpOp}
-import decaf.tree.TypedTree._
-import decaf.tree.{TreeNode, TypedTree}
+import decaf.frontend.tree.TreeNode.{ArithOp, EqOrCmpOp}
+import decaf.frontend.tree.TypedTree._
+import decaf.frontend.tree.{TreeNode, TypedTree}
 import org.objectweb.asm.{ClassWriter, Label, MethodVisitor, Opcodes}
 
 import scala.collection.mutable
diff --git a/src/main/scala/decaf/jvm/Util.scala b/src/main/scala/decaf/jvm/Util.scala
@@ -1,7 +1,7 @@
 package decaf.jvm
 
-import decaf.annot._
-import decaf.tree.TreeNode
+import decaf.frontend.annot._
+import decaf.frontend.tree.TreeNode
 import org.objectweb.asm.{Label, MethodVisitor, Opcodes, Type => ASMType}
 
 trait Util {
diff --git a/src/main/scala/decaf/printing/PrettyScope.scala b/src/main/scala/decaf/printing/PrettyScope.scala
@@ -1,6 +1,6 @@
 package decaf.printing
 
-import decaf.annot._
+import decaf.frontend.annot._
 import decaf.lowlevel.log.IndentPrinter
 
 /**
diff --git a/src/main/scala/decaf/printing/PrettyTree.scala b/src/main/scala/decaf/printing/PrettyTree.scala
@@ -1,8 +1,8 @@
 package decaf.printing
 
-import decaf.annot.Annotated
+import decaf.frontend.annot.Annotated
 import decaf.lowlevel.log.IndentPrinter
-import decaf.tree.TreeNode.Node
+import decaf.frontend.tree.TreeNode.Node
 
 class PrettyTree(printer: IndentPrinter) extends PrettyPrinter[Node with Annotated[_]](printer) {
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package decaf.error`
	`1`	`+package decaf.driver.error`
`2`	`2`
`3`	`3`	`import java.io.PrintStream`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package decaf.annot`
	`1`	`+package decaf.frontend.annot`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* An "annotation" is something that is labeled on a tree node.`