Version 4.0 bez kommentariev

Author: IOANNVOLZHSKIY

lab5/src/classes/GSSNode.dart

@@ -115,12 +115,11 @@ class _GSSNode<T> {
 
   void _getAncestorsRecursive(
       _GSSNode<T> currentNode, int k, Set<_GSSNode<T>> result) {
-    if (k < 0) {
+    if (k == 0) {
+      result.add(currentNode);
       return;
     }
 
-    result.add(currentNode);
-
     if (currentNode.level == 0) {
       return;
     }

lab5/src/lr0/lr0Parser.dart

@@ -45,6 +45,7 @@ class LR0Parser {
         } else {
           List<GSSNode<List<String>>> prevCopy = List.from(v_ss.prev.values);
           for (final l in prevCopy) {
+
             if (l.value == v1_s.value) {
               int ind = node_id_next();
               nodes[ind] = stack.push(v_ss_value, v1_s as GSSNode<List<String>>?); //vc_ss
@@ -56,7 +57,9 @@ class LR0Parser {
                 }
               }
             } else {
+
               v_ss.addPrevByValue(v1_s);
+
               if (P.contains(v_ss)) {
                 int ind = node_id_next();
                 nodes[ind] = stack.push(v_ss_value, v1_s as GSSNode<List<String>>?); //vc_ss
@@ -129,7 +132,14 @@ class LR0Parser {
         }
       }
 
-      for (final hidenode in reduced) {
+      if(reduced.every((r) => P.contains(r)) && reduced.length != 0) {
+        test = false;
+        check = true;
+      }
+
+      List<GSSNode<List<String>>> reducedCopy = List.from(reduced);
+
+      for (final hidenode in reducedCopy) {
         P.add(hidenode);
         final act = _table.lr0_table[int.parse(hidenode.value[1])]?[word_tokens[i]]!;
 
@@ -146,6 +156,15 @@ class LR0Parser {
           }
         }
 
+        for (var obj in act) {
+          if (obj.actionTitle.startsWith("r")) {
+            Reduce(hidenode, obj.ruleNumber!, word_tokens[i], P, reduced);
+            if (reduced.length != 0) {
+              test = true;
+            }
+          }
+        }
+
         for (var obj in act) {
           if (obj.actionTitle == 'ACC') {
             GSSNode<List<String>> lastNode = stack.levels.last.nodes.values.last;

lab5/src/tests/GSS_test.dart

@@ -1,7 +1,6 @@
 import 'package:test/test.dart';
 import '../classes/GSStack.dart';
 import '../classes/GSSNode.dart';
-import '../types/Comparator.dart';
 
 void main() {
   group('GSStack: example', () {
@@ -20,20 +19,17 @@ void main() {
 
       // {7,4,1,0}
       nodes[4] = stack.push(["4"], nodes[1]);
-      nodes[9] = stack.push(["7"],
-          nodes[4]); // 7 isn't duplicated, as it ends up in the same layer
+      nodes[9] = stack.push(["7"], nodes[4]); // 7 isn't duplicated, as it ends up in the same layer
 
       // {7,5,2,0}
       nodes[2] = stack.push(["2"], nodes[0]);
       nodes[5] = stack.push(["5"], nodes[2]);
-      nodes[15] = stack.push(["7, 5"], nodes[5]);
+      nodes[7] = stack.push(["7"], nodes[5]);
 
       // {8,6,2,0}
       nodes[6] = stack.push(["6"], nodes[2]);
       nodes[8] = stack.push(["8"], nodes[6]);
 
-      var result = nodes[7]?.ancestors(1);
-
       /*for (final ancestor in result!) {
         print(ancestor.id);
       }*/
@@ -42,7 +38,7 @@ void main() {
     });
 
     test('random staff', () {
-      print(nodes[8]?.prev);
+      print(nodes[7]?.ancestors(3));
     });
 
     /*test('has the right degrees: prev', () {