Update app.py

app.py

@@ -1,3 +1,4 @@
+
 import copy
 import streamlit as st
 
@@ -125,44 +126,28 @@ def generateStates(I0):
     return
 
 def first(rule):
-    global diction, term_userdef
-    if len(rule) != 0 and (rule is not None):
-        if rule[0] in term_userdef:
-            return rule[0]
-        elif rule[0] == '#':
-            return '#'
+    global rules, term_userdef, diction, firsts
+    if len(rule) != 0 and rule[0] in term_userdef:
+        return [rule[0]]
+    if len(rule) != 0 and rule[0] == '#':
+        return ['#']
     if len(rule) != 0:
-        if rule[0] in list(diction.keys()):
-            fres = []
-            rhs_rules = diction[rule[0]]
-            for itr in rhs_rules:
-                indivRes = first(itr)
-                if type(indivRes) is list:
-                    for i in indivRes:
-                        fres.append(i)
-                else:
-                    fres.append(indivRes)
-
-            if '#' not in fres:
-                return fres
-            else:
-                newList = []
-                fres.remove('#')
+        fres = []
+        rhs_rules = diction[rule[0]]
+        for itr in rhs_rules:
+            indivRes = first(itr)
+            if '#' in indivRes:
+                indivRes.remove('#')
                 if len(rule) > 1:
-                    ansNew = first(rule[1:])
-                    if ansNew != None:
-                        if type(ansNew) is list:
-                            newList = fres + ansNew
-                        else:
-                            newList = fres + [ansNew]
-                    else:
-                        newList = fres
-                    return newList
-                fres.append('#')
-                return fres
+                    indivRes += first(rule[1:])
+                else:
+                    indivRes.append('#')
+            fres.extend(indivRes)
+        return list(set(fres))
+    return []
 
 def follow(nt):
-    global start_symbol, diction
+    global start_symbol, diction, firsts, follows
     solset = set()
     if nt == start_symbol:
         solset.add('$')
@@ -173,32 +158,20 @@ def follow(nt):
                 while nt in subrule:
                     index_nt = subrule.index(nt)
                     subrule = subrule[index_nt + 1:]
-                    if len(subrule) != 0:
+                    if subrule:
                         res = first(subrule)
                         if '#' in res:
-                            newList = []
                             res.remove('#')
-                            ansNew = follow(curNT)
-                            if ansNew != None:
-                                if type(ansNew) is list:
-                                    newList = res + ansNew
-                                else:
-                                    newList = res + [ansNew]
-                            else:
-                                newList = res
-                            res = newList
+                            solset.update(res)
+                            solset.update(follow(curNT))
+                        else:
+                            solset.update(res)
                     else:
                         if nt != curNT:
-                            res = follow(curNT)
-
-                    if res is not None:
-                        if type(res) is list:
-                            for g in res:
-                                solset.add(g)
-                        else:
-                            solset.add(res)
+                            solset.update(follow(curNT))
     return list(solset)
 
+    
 def createParseTable(statesDict, stateMap, T, NT):
     global separatedRulesList, diction
 
@@ -309,4 +282,4 @@ def main():
         st.text_area("Compact Follow Sets Representation:", value=compact_follow, height=300)
 
 if __name__ == "__main__":
-    main()
+    main()