update scope pretty print format, and update test cases

paulzfm · paulzfm · commit 5e6a2673e586 · 2019-09-02T12:24:33.000+08:00
diff --git a/TestCases/S2/result/math.result b/TestCases/S2/result/math.result
@@ -2,11 +2,11 @@ GLOBAL SCOPE:
     (1,1) -> class Math
     (50,1) -> class Main
     CLASS SCOPE OF 'Math':
-        (2,16) -> static function abs : int->int
-        (10,16) -> static function pow : int->int->int
-        (20,16) -> static function log : int->int
-        (33,16) -> static function max : int->int->int
-        (41,16) -> static function min : int->int->int
+        (2,16) -> static function abs : int -> int
+        (10,16) -> static function pow : (int, int) -> int
+        (20,16) -> static function log : int -> int
+        (33,16) -> static function max : (int, int) -> int
+        (41,16) -> static function min : (int, int) -> int
         FORMAL SCOPE OF 'abs':
             (2,24) -> variable @a : int
             LOCAL SCOPE:
@@ -38,6 +38,6 @@ GLOBAL SCOPE:
                 LOCAL SCOPE:
                 LOCAL SCOPE:
     CLASS SCOPE OF 'Main':
-        (51,17) -> static function main : void
+        (51,17) -> static function main : () -> void
         FORMAL SCOPE OF 'main':
             LOCAL SCOPE:
diff --git a/TestCases/S2/result/queue.result b/TestCases/S2/result/queue.result
@@ -6,12 +6,12 @@ GLOBAL SCOPE:
         (2,9) -> variable data : int
         (3,21) -> variable next : class : QueueItem
         (4,21) -> variable prev : class : QueueItem
-        (6,10) -> function Init : class : QueueItem->int->class : QueueItem->class : QueueItem->void
-        (13,9) -> function GetData : class : QueueItem->int
-        (16,21) -> function GetNext : class : QueueItem->class : QueueItem
-        (19,21) -> function GetPrev : class : QueueItem->class : QueueItem
-        (22,10) -> function SetNext : class : QueueItem->class : QueueItem->void
-        (25,10) -> function SetPrev : class : QueueItem->class : QueueItem->void
+        (6,10) -> function Init : (int, class : QueueItem, class : QueueItem) -> void
+        (13,9) -> function GetData : () -> int
+        (16,21) -> function GetNext : () -> class : QueueItem
+        (19,21) -> function GetPrev : () -> class : QueueItem
+        (22,10) -> function SetNext : class : QueueItem -> void
+        (25,10) -> function SetPrev : class : QueueItem -> void
         FORMAL SCOPE OF 'Init':
             (6,10) -> variable @this : class : QueueItem
             (6,19) -> variable @data : int
@@ -38,9 +38,9 @@ GLOBAL SCOPE:
     CLASS SCOPE OF 'Queue':
         (31,9) -> variable sp : int
         (32,21) -> variable head : class : QueueItem
-        (34,10) -> function Init : class : Queue->void
-        (38,10) -> function EnQueue : class : Queue->int->void
-        (43,9) -> function DeQueue : class : Queue->int
+        (34,10) -> function Init : () -> void
+        (38,10) -> function EnQueue : int -> void
+        (43,9) -> function DeQueue : () -> int
         FORMAL SCOPE OF 'Init':
             (34,10) -> variable @this : class : Queue
             LOCAL SCOPE:
@@ -57,7 +57,7 @@ GLOBAL SCOPE:
                 LOCAL SCOPE:
                     (49,29) -> variable temp : class : QueueItem
     CLASS SCOPE OF 'Main':
-        (60,17) -> static function main : void
+        (60,17) -> static function main : () -> void
         FORMAL SCOPE OF 'main':
             LOCAL SCOPE:
                 (61,21) -> variable q : class : Queue
diff --git a/TestCases/S2/result/stack.result b/TestCases/S2/result/stack.result
@@ -4,11 +4,11 @@ GLOBAL SCOPE:
     CLASS SCOPE OF 'Stack':
         (2,9) -> variable sp : int
         (3,11) -> variable elems : int[]
-        (5,10) -> function Init : class : Stack->void
-        (11,10) -> function Push : class : Stack->int->void
-        (16,9) -> function Pop : class : Stack->int
-        (23,9) -> function NumElems : class : Stack->int
-        (27,17) -> static function main : void
+        (5,10) -> function Init : () -> void
+        (11,10) -> function Push : int -> void
+        (16,9) -> function Pop : () -> int
+        (23,9) -> function NumElems : () -> int
+        (27,17) -> static function main : () -> void
         FORMAL SCOPE OF 'Init':
             (5,10) -> variable @this : class : Stack
             LOCAL SCOPE:
@@ -27,6 +27,6 @@ GLOBAL SCOPE:
             LOCAL SCOPE:
                 (28,21) -> variable s : class : Stack
     CLASS SCOPE OF 'Main':
-        (39,14) -> static function main : void
+        (39,14) -> static function main : () -> void
         FORMAL SCOPE OF 'main':
             LOCAL SCOPE:
diff --git a/TestCases/S2/result/t1.result b/TestCases/S2/result/t1.result
@@ -1,6 +1,6 @@
 GLOBAL SCOPE:
     (1,1) -> class Main
     CLASS SCOPE OF 'Main':
-        (2,17) -> static function main : void
+        (2,17) -> static function main : () -> void
         FORMAL SCOPE OF 'main':
             LOCAL SCOPE:
diff --git a/TestCases/S2/result/t2.result b/TestCases/S2/result/t2.result
@@ -1,7 +1,7 @@
 GLOBAL SCOPE:
     (2,1) -> class Main
     CLASS SCOPE OF 'Main':
-        (3,17) -> static function main : void
+        (3,17) -> static function main : () -> void
         FORMAL SCOPE OF 'main':
             LOCAL SCOPE:
                 (4,13) -> variable a : int
diff --git a/TestCases/S2/result/t3.result b/TestCases/S2/result/t3.result
@@ -1,8 +1,8 @@
 GLOBAL SCOPE:
     (1,1) -> class Main
     CLASS SCOPE OF 'Main':
-        (2,17) -> static function main : void
-        (12,16) -> static function test : int->int->int
+        (2,17) -> static function main : () -> void
+        (12,16) -> static function test : (int, int) -> int
         FORMAL SCOPE OF 'main':
             LOCAL SCOPE:
                 (3,13) -> variable c : int
diff --git a/TestCases/S2/result/t4.result b/TestCases/S2/result/t4.result
@@ -3,9 +3,9 @@ GLOBAL SCOPE:
     CLASS SCOPE OF 'Main':
         (3,9) -> variable a : int
         (4,14) -> variable b : string[]
-        (6,11) -> function tester : class : Main->int->int[]
-        (11,10) -> function start : class : Main->void
-        (28,17) -> static function main : void
+        (6,11) -> function tester : int -> int[]
+        (11,10) -> function start : () -> void
+        (28,17) -> static function main : () -> void
         FORMAL SCOPE OF 'tester':
             (6,11) -> variable @this : class : Main
             (6,22) -> variable @d : int
diff --git a/TestCases/S2/result/t5.result b/TestCases/S2/result/t5.result
@@ -4,8 +4,8 @@ GLOBAL SCOPE:
     CLASS SCOPE OF 'Cow':
         (2,9) -> variable height : int
         (3,9) -> variable weight : int
-        (5,10) -> function Init : class : Cow->int->int->void
-        (10,10) -> function Moo : class : Cow->void
+        (5,10) -> function Init : (int, int) -> void
+        (10,10) -> function Moo : () -> void
         FORMAL SCOPE OF 'Init':
             (5,10) -> variable @this : class : Cow
             (5,19) -> variable @w : int
@@ -15,7 +15,7 @@ GLOBAL SCOPE:
             (10,10) -> variable @this : class : Cow
             LOCAL SCOPE:
     CLASS SCOPE OF 'Main':
-        (16,17) -> static function main : void
+        (16,17) -> static function main : () -> void
         FORMAL SCOPE OF 'main':
             LOCAL SCOPE:
                 (17,19) -> variable betsy : class : Cow
diff --git a/TestCases/S2/result/t6.result b/TestCases/S2/result/t6.result
@@ -1,8 +1,8 @@
 GLOBAL SCOPE:
     (1,1) -> class Main
     CLASS SCOPE OF 'Main':
-        (3,16) -> static function Binky : int->int[]->int[]->int
-        (7,17) -> static function main : void
+        (3,16) -> static function Binky : (int, int[], int[]) -> int
+        (7,17) -> static function main : () -> void
         FORMAL SCOPE OF 'Binky':
             (3,26) -> variable @a : int
             (3,35) -> variable @b : int[]
diff --git a/TestCases/S2/result/t7.result b/TestCases/S2/result/t7.result
@@ -4,7 +4,7 @@ GLOBAL SCOPE:
     (17,1) -> class Main
     CLASS SCOPE OF 'Computer':
         (2,9) -> variable cpu : int
-        (3,10) -> function Crash : class : Computer->int->void
+        (3,10) -> function Crash : int -> void
         FORMAL SCOPE OF 'Crash':
             (3,10) -> variable @this : class : Computer
             (3,20) -> variable @numTimes : int
@@ -13,13 +13,13 @@ GLOBAL SCOPE:
                 LOCAL SCOPE:
     CLASS SCOPE OF 'Mac':
         (11,9) -> variable mouse : int
-        (12,10) -> function Crash : class : Mac->int->void
+        (12,10) -> function Crash : int -> void
         FORMAL SCOPE OF 'Crash':
             (12,10) -> variable @this : class : Mac
             (12,20) -> variable @numTimes : int
             LOCAL SCOPE:
     CLASS SCOPE OF 'Main':
-        (18,17) -> static function main : void
+        (18,17) -> static function main : () -> void
         FORMAL SCOPE OF 'main':
             LOCAL SCOPE:
                 (19,19) -> variable powerbook : class : Mac
diff --git a/TestCases/S2/result/t8.result b/TestCases/S2/result/t8.result
@@ -5,9 +5,9 @@ GLOBAL SCOPE:
     CLASS SCOPE OF 'Animal':
         (6,9) -> variable height : int
         (7,18) -> variable mother : class : Animal
-        (8,10) -> function InitAnimal : class : Animal->int->class : Animal->void
-        (13,9) -> function GetHeight : class : Animal->int
-        (17,18) -> function GetMom : class : Animal->class : Animal
+        (8,10) -> function InitAnimal : (int, class : Animal) -> void
+        (13,9) -> function GetHeight : () -> int
+        (17,18) -> function GetMom : () -> class : Animal
         FORMAL SCOPE OF 'InitAnimal':
             (8,10) -> variable @this : class : Animal
             (8,25) -> variable @h : int
@@ -21,8 +21,8 @@ GLOBAL SCOPE:
             LOCAL SCOPE:
     CLASS SCOPE OF 'Cow':
         (23,10) -> variable isSpotted : bool
-        (24,10) -> function InitCow : class : Cow->int->class : Animal->bool->void
-        (28,10) -> function IsSpottedCow : class : Cow->bool
+        (24,10) -> function InitCow : (int, class : Animal, bool) -> void
+        (28,10) -> function IsSpottedCow : () -> bool
         FORMAL SCOPE OF 'InitCow':
             (24,10) -> variable @this : class : Cow
             (24,22) -> variable @h : int
@@ -33,7 +33,7 @@ GLOBAL SCOPE:
             (28,10) -> variable @this : class : Cow
             LOCAL SCOPE:
     CLASS SCOPE OF 'Main':
-        (34,17) -> static function main : void
+        (34,17) -> static function main : () -> void
         FORMAL SCOPE OF 'main':
             LOCAL SCOPE:
                 (35,19) -> variable betsy : class : Cow
diff --git a/TestCases/S2/result/t9.result b/TestCases/S2/result/t9.result
@@ -3,11 +3,11 @@ GLOBAL SCOPE:
     (7,1) -> class A : Main
     CLASS SCOPE OF 'Main':
         (2,9) -> variable a : int
-        (3,17) -> static function main : void
+        (3,17) -> static function main : () -> void
         FORMAL SCOPE OF 'main':
             LOCAL SCOPE:
     CLASS SCOPE OF 'A':
-        (8,10) -> function func : class : A->void
+        (8,10) -> function func : () -> void
         FORMAL SCOPE OF 'func':
             (8,10) -> variable @this : class : A
             LOCAL SCOPE:
diff --git a/TestCases/S2/result/z1.result b/TestCases/S2/result/z1.result
@@ -6,8 +6,8 @@ GLOBAL SCOPE:
     (49,1) -> class Sub3 : Sub1
     (52,1) -> class Sub4 : Sub3
     CLASS SCOPE OF 'Main':
-        (2,17) -> static function main : void
-        (25,17) -> static function printType : class : Base->void
+        (2,17) -> static function main : () -> void
+        (25,17) -> static function printType : class : Base -> void
         FORMAL SCOPE OF 'main':
             LOCAL SCOPE:
                 (3,20) -> variable b : class : Base
diff --git a/TestCases/S2/result/z3.result b/TestCases/S2/result/z3.result
@@ -2,7 +2,7 @@ GLOBAL SCOPE:
     (3,1) -> class Main
     (10,1) -> class NQueues
     CLASS SCOPE OF 'Main':
-        (5,17) -> static function main : void
+        (5,17) -> static function main : () -> void
         FORMAL SCOPE OF 'main':
             LOCAL SCOPE:
     CLASS SCOPE OF 'NQueues':
@@ -11,11 +11,11 @@ GLOBAL SCOPE:
         (13,11) -> variable row : int[]
         (14,11) -> variable di1 : int[]
         (15,11) -> variable di2 : int[]
-        (18,19) -> function init : class : NQueues->int->class : NQueues
-        (29,10) -> function solve : class : NQueues->void
-        (34,11) -> function clearArray : class : NQueues->int[]->int[]
-        (45,10) -> function printBoard : class : NQueues->int[]->int->void
-        (65,10) -> function try : class : NQueues->int->int[]->int[]->int[]->int[]->void
+        (18,19) -> function init : int -> class : NQueues
+        (29,10) -> function solve : () -> void
+        (34,11) -> function clearArray : int[] -> int[]
+        (45,10) -> function printBoard : (int[], int) -> void
+        (65,10) -> function try : (int, int[], int[], int[], int[]) -> void
         FORMAL SCOPE OF 'init':
             (18,19) -> variable @this : class : NQueues
             (18,28) -> variable @n : int
diff --git a/TestCases/S2/result/z6.result b/TestCases/S2/result/z6.result
@@ -2,8 +2,8 @@ GLOBAL SCOPE:
     (1,1) -> class MultipleFormals
     (20,1) -> class Main
     CLASS SCOPE OF 'MultipleFormals':
-        (3,9) -> function foo : class : MultipleFormals->int->int->int->int
-        (7,9) -> function method : class : MultipleFormals->int
+        (3,9) -> function foo : (int, int, int) -> int
+        (7,9) -> function method : () -> int
         FORMAL SCOPE OF 'foo':
             (3,9) -> variable @this : class : MultipleFormals
             (3,17) -> variable @x : int
@@ -17,6 +17,6 @@ GLOBAL SCOPE:
                 (9,13) -> variable y : int
                 (10,13) -> variable z : int
     CLASS SCOPE OF 'Main':
-        (21,14) -> static function main : void
+        (21,14) -> static function main : () -> void
         FORMAL SCOPE OF 'main':
             LOCAL SCOPE:
diff --git a/TestCases/S2/result/z7.result b/TestCases/S2/result/z7.result
@@ -4,19 +4,19 @@ GLOBAL SCOPE:
     (25,1) -> class Main
     CLASS SCOPE OF 'Father':
         (2,9) -> variable field : int
-        (4,9) -> function method : class : Father->int->int
+        (4,9) -> function method : int -> int
         FORMAL SCOPE OF 'method':
             (4,9) -> variable @this : class : Father
             (4,20) -> variable @f : int
             LOCAL SCOPE:
                 LOCAL SCOPE:
     CLASS SCOPE OF 'Child':
-        (14,10) -> function start : class : Child->void
+        (14,10) -> function start : () -> void
         FORMAL SCOPE OF 'start':
             (14,10) -> variable @this : class : Child
             LOCAL SCOPE:
                 (15,22) -> variable p : class : Father
     CLASS SCOPE OF 'Main':
-        (26,14) -> static function main : void
+        (26,14) -> static function main : () -> void
         FORMAL SCOPE OF 'main':
             LOCAL SCOPE:
diff --git a/TestCases/S2/result/z9.result b/TestCases/S2/result/z9.result
@@ -2,9 +2,9 @@ GLOBAL SCOPE:
     (1,1) -> class Main
     CLASS SCOPE OF 'Main':
         (2,6) -> variable x : int
-        (3,7) -> function set : class : Main->int->void
-        (6,6) -> function get : class : Main->int
-        (11,14) -> static function main : void
+        (3,7) -> function set : int -> void
+        (6,6) -> function get : () -> int
+        (11,14) -> static function main : () -> void
         FORMAL SCOPE OF 'set':
             (3,7) -> variable @this : class : Main
             (3,15) -> variable @x : int
diff --git a/src/main/scala/decaf/annot/Symbol.scala b/src/main/scala/decaf/annot/Symbol.scala
@@ -76,8 +76,7 @@ class MethodSymbol(tree: SyntaxTree.MethodDef, val typ: FunType, val scope: Form
 
   override def pos: Pos = tree.pos
 
-  override def str: String = (if (isStatic) "static " else "") + s"function $name : " +
-    (if (isStatic) "" else s"class : ${ owner.name }->") + typ.toString
+  override def str: String = (if (isStatic) "static " else "") + s"function $name : " + typ.toString
 
   scope.owner = this
 
diff --git a/src/main/scala/decaf/annot/Type.scala b/src/main/scala/decaf/annot/Type.scala
@@ -124,7 +124,14 @@ case class FunType(params: List[Type], ret: Type) extends Type {
     case _ => false
   }
 
-  override def toString: String = params.map(_ + "->").mkString + ret
+  override def toString: String = {
+    val ps = params match {
+      case Nil => "()"
+      case t :: Nil => t.toString
+      case ts => s"(${ ts.mkString(", ") })"
+    }
+    s"$ps -> $ret"
+  }
 }
 
 object NoType extends Type {
