Update WaitGroup test to use 100 iterations

No idea why its suddenly super slow Also add the grammar file cos I forgot to
CS4215-OOGA · Apr 13, 2024 · d31d41f · d31d41f
1 parent 3c86d5c
commit d31d41f
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 58 deletions.
diff --git a/src/parser/ooga.pegjs b/src/parser/ooga.pegjs
@@ -152,6 +152,7 @@ Keyword
   / CaseToken
   / DefaultToken
   / SelectToken
+  / AppendToken
 
 
 Type
@@ -275,6 +276,7 @@ SwitchToken     = "switch"     !IdentifierPart
 CaseToken       = "case"       !IdentifierPart
 DefaultToken    = "default"    !IdentifierPart
 SelectToken     = "select"     !IdentifierPart
+AppendToken     = "append"     !IdentifierPart
 
 
 SingleLineComment
@@ -391,6 +393,13 @@ CallExpression
             args: args || []
         };
     }
+    / AppendToken __ "(" __ name:Identifier __ "," __ args:ArgumentList __ ")" {
+      return {
+        tag: "AppendExpression",
+        name: name,
+        args: args
+      }
+    }
 
 MakeArguments
   = "," __ args:ArgumentList {

diff --git a/src/tests/test.ts b/src/tests/test.ts
@@ -839,64 +839,66 @@ v.X // 3
 
 // Test WaitGroups
 
-// testProgram(
-//     `
-//
-// type Vertex struct {
-//     X int
-// }
-//
-// func (v *Vertex) Add(w Vertex) {
-//     v.X = v.X + w.X;
-// }
-//
-// v := Vertex{1};
-// w := Vertex{2};
-//
-// go func() {
-//     for i := 0; i < 1000; i++ { // iterate for 1000 times to prove that waitgroup works as intended
-//     }
-//     v.Add(w);
-// }()
-//
-// v.X; //1
-// `,
-//     1,
-//     '',
-//     defaultNumWords
-// );
-
-// testProgram(
-//     `
-//
-// type Vertex struct {
-//     X int
-// }
-//
-// func (v *Vertex) Add(w Vertex) {
-//     v.X = v.X + w.X;
-// }
-//
-// v := Vertex{1};
-// w := Vertex{2};
-//
-// wg := WaitGroup{1};
-//
-// go func() {
-//     for i := 0; i < 1000; i++ { // iterate for 1000 times to prove that waitgroup works as intended
-//     }
-//     v.Add(w);
-//     wg.Done();
-// }()
-//
-// wg.Wait();
-//
-// v.X; //3
-// `,
-//     3,
-//     '',
-//     defaultNumWords
-// );
+testProgram(
+    `
+
+type Vertex struct {
+    X int
+}
+
+func (v *Vertex) Add(w Vertex) {
+    v.X = v.X + w.X;
+}
+
+v := Vertex{1};
+w := Vertex{2};
+
+go func() {
+    for i := 0; i < 100; i++ { // iterate for 100 times to prove that waitgroup works as intended
+    }
+    v.Add(w);
+}()
+
+v.X; //1
+`,
+    1,
+    '',
+    defaultNumWords
+);
+
+testProgram(
+    `
+
+type Vertex struct {
+    X int
+}
+
+func (v *Vertex) Add(w Vertex) {
+    v.X = v.X + w.X;
+}
+
+v := Vertex{1};
+w := Vertex{2};
+
+wg := WaitGroup{1};
+
+go func() {
+
+    for i := 0; i < 100; i++ { // iterate for 100 times to prove that waitgroup works as intended
+    }
+    v.Add(w);
+    wg.Done();
+}()
+
+wg.Wait();
+
+v.X; //3
+
+`,
+    3,
+    '',
+    defaultNumWords
+);
 
 // Testing struct methods with goroutines (goroutines cannot return anything)
 testProgram(