Merge remote-tracking branch 'origin/main'

# Conflicts: # lab5/main.dart # lab5/src/lr0/lr0Parser.dart
Encapsulateed · Jan 23, 2024 · fa396ae · fa396ae
2 parents 890cc42 + 6792927
commit fa396ae
Show file tree

Hide file tree

Showing 5 changed files with 128 additions and 38 deletions.
diff --git a/lab5/Step n.txt b/lab5/Step n.txt
@@ -0,0 +1,18 @@
+digraph {
+rankdir = LR
+dummy [shape=none, label="", width=0, height=0]
+  subgraph cluster_0 {
+    label="Level 0";
+    "[0, 0, b]" [label="[0, 0, b]"];
+  }
+  subgraph cluster_1 {
+    label="Level 1";
+    "[1, 2, b]" [label="[1, 2, b]"];
+  }
+  subgraph cluster_2 {
+    label="Level 2";
+    "[2, 4, b]" [label="[2, 4, b]"];
+  }
+  "[1, 2, b]" -> "[2, 4, b]";
+  "[0, 0, b]" -> "[1, 2, b]";
+}
diff --git a/lab5/TEST.txt b/lab5/TEST.txt
@@ -0,0 +1,42 @@
+digraph {
+rankdir = LR
+dummy [shape=none, label="", width=0, height=0]
+  subgraph cluster_0 {
+    label="Level 0";
+    "[0, 0]" [label="[0, 0]"];
+  }
+  subgraph cluster_1 {
+    label="Level 1";
+    "[1, 2]" [label="[1, 2]"];
+  }
+  subgraph cluster_2 {
+    label="Level 2";
+    "[2, 4]" [label="[2, 4]"];
+    "[2, 1]" [label="[2, 1]"];
+  }
+  subgraph cluster_3 {
+    label="Level 3";
+    "[3, 2]" [label="[3, 2]"];
+  }
+  subgraph cluster_4 {
+    label="Level 4";
+    "[4, 4]" [label="[4, 4]"];
+    "[4, 6]" [label="[4, 6]"];
+  }
+  subgraph cluster_5 {
+    label="Level 5";
+    "[5, 2]" [label="[5, 2]"];
+  }
+  subgraph cluster_6 {
+    label="Level 6";
+    "[6, 1]" [label="[6, 1]"];
+  }
+  "[0, 0]" -> "[6, 1]";
+  "[4, 4]" -> "[5, 2]";
+  "[3, 2]" -> "[4, 4]";
+  "[2, 4]" -> "[4, 6]";
+  "[2, 4]" -> "[3, 2]";
+  "[1, 2]" -> "[2, 4]";
+  "[0, 0]" -> "[2, 1]";
+  "[0, 0]" -> "[1, 2]";
+}
diff --git a/lab5/chipichipi.txt b/lab5/chipichipi.txt
@@ -0,0 +1,47 @@
+digraph {
+rankdir = LR
+dummy [shape=none, label="", width=0, height=0]
+  subgraph cluster_0 {
+    label="Level 0";
+    "[0, 0]" [label="[0, 0]"];
+  }
+  subgraph cluster_1 {
+    label="Level 1";
+    "[1, 2]" [label="[1, 2]"];
+  }
+  subgraph cluster_2 {
+    label="Level 2";
+    "[2, 4]" [label="[2, 4]"];
+    "[2, 1]" [label="[2, 1]"];
+  }
+  subgraph cluster_3 {
+    label="Level 3";
+    "[3, 2]" [label="[3, 2]"];
+  }
+  subgraph cluster_4 {
+    label="Level 4";
+    "[4, 4]" [label="[4, 4]"];
+    "[4, 6]" [label="[4, 6]"];
+  }
+  subgraph cluster_5 {
+    label="Level 5";
+    "[5, 2]" [label="[5, 2]"];
+  }
+  subgraph cluster_6 {
+    label="Level 6";
+    "[6, 1]" [label="[6, 1]"];
+  }
+  subgraph cluster_7 {
+    label="Level 7";
+    "[ACC, ACC]" [label="[ACC, ACC]"];
+  }
+  "[6, 1]" -> "[ACC, ACC]";
+  "[0, 0]" -> "[6, 1]";
+  "[4, 4]" -> "[5, 2]";
+  "[3, 2]" -> "[4, 4]";
+  "[2, 4]" -> "[4, 6]";
+  "[2, 4]" -> "[3, 2]";
+  "[1, 2]" -> "[2, 4]";
+  "[0, 0]" -> "[2, 1]";
+  "[0, 0]" -> "[1, 2]";
+}
diff --git a/lab5/penis.txt b/lab5/penis.txt
diff --git a/lab5/results/stack_dump_on_1.txt b/lab5/results/stack_dump_on_1.txt
@@ -9,14 +9,30 @@ dummy [shape=none, label="", width=0, height=0]
     label="Level 1";
     "[2, 1, b]" [label="[2, 1, b]"];
     "[1, 2, b]" [label="[1, 2, b]"];
+    "[1, 5, b]" [label="[1, 5, b]"];
   }
   subgraph cluster_2 {
     label="Level 2";
     "[4, 2, b]" [label="[4, 2, b]"];
-    "[3, 3, $]" [label="[3, 3, $]"];
+    "[3, 3, b]" [label="[3, 3, b]"];
+    "[3, 6, $]" [label="[3, 6, $]"];
   }
-  "[2, 1, b]" -> "[0, 0, b]";
-  "[1, 2, b]" -> "[0, 0, b]";
-  "[4, 2, b]" -> "[2, 1, b]";
-  "[3, 3, $]" -> "[1, 2, b]";
+  subgraph cluster_3 {
+    label="Level 3";
+    "[2, 4, b]" [label="[2, 4, b]"];
+    "[5, 5, b]" [label="[5, 5, b]"];
+  }
+  subgraph cluster_4 {
+    label="Level 4";
+    "[4, 5, b]" [label="[4, 5, b]"];
+  }
+  "[2, 4, b]" -> "[4, 5, b]";
+  "[3, 3, b]" -> "[2, 4, b]";
+  "[3, 3, b]" -> "[5, 5, b]";
+  "[2, 1, b]" -> "[4, 2, b]";
+  "[1, 2, b]" -> "[3, 3, b]";
+  "[1, 5, b]" -> "[3, 6, $]";
+  "[0, 0, b]" -> "[2, 1, b]";
+  "[0, 0, b]" -> "[1, 2, b]";
+  "[0, 0, b]" -> "[1, 5, b]";
 }