form nfas from file text

Author: jonathantsang

src/watcompiler/Tokens.txt

@@ -0,0 +1,2 @@
+BRACKET { } ( ) [ ]
+BOOLEAN true false

src/watcompiler/re.clj

@@ -1,7 +1,8 @@
 (ns watcompiler.re
   (:require [clojure.set :refer :all]
             [watcompiler.nfa :refer :all]
-            [watcompiler.lang :refer :all])
+            [watcompiler.lang :refer :all]
+            [clojure.string :as str])
   (:import [watcompiler.nfa NFA]))
 
 ;; Merging multiple nfas
@@ -62,7 +63,7 @@
   [& arguments]
   (let
     [stateS (gensym :s)
-     class (first arguments)
+     class (keyword (first arguments)) ;; Conver to a keyword since it reads strings from a file
      args (rest arguments)
      ;; Key: string for keyword, Value: NFA for that keyword
      strings-nfas (into (sorted-map) (for [nfa-name args]
@@ -85,6 +86,23 @@
                all-transitions
                all-accept-priorities)))
 
+(def readFile
+   (with-open [rdr (clojure.java.io/reader "src/watcompiler/Tokens.txt")]
+     (reduce conj [] (line-seq rdr))))
+
+(def splitLines
+  (into []
+  (for [x readFile]
+       (str/split x #" "))))
+
+(def fileFormedNFA
+  (let [nfas
+    (into []
+    (for [x splitLines]
+         (apply form-multiple-nfas x)))]
+    (apply merge-nfas nfas)))
+
+
 ;; NFAs for types
 
 ;; Integer literal
@@ -106,6 +124,28 @@
                       ">=" "<=" "&" "&=" "=" "==" "!" "!=" "^=" "^" "+" "+="
                       "++" "-" "-=" "--" "*" "*=" "/" "/=" "%" "%="))
 
+;; read in the file, getting the parameters for non-regex nfas, merge them
+
+
+;; white space
+
+
+;; binary operators and assignment operators
+
+;; assignment operators
+;; AssignmentOperator: one of
+;; = *= /= %= += -= <<= >>= >>>= &= ^= |=
+
+;; unary operators
+;; binary operators on two elements
+
+;; ; semi-colon , comma, quotation marks ""
+
+;; String literal
+;; ".*"
+
+
+
 ;; Keywords nfa
 (def keywords-nfa
   (form-multiple-nfas :KEYWORD

test/watcompiler/re_test.clj

@@ -4,6 +4,16 @@
             [watcompiler.re :refer :all])
   (:import [watcompiler.nfa NFA]))
 
+;; Form the NFAs from a file
+(deftest read-file
+  (def lines readFile)
+  (def separated splitLines)
+  (def formed fileFormedNFA)
+
+  (is (= :BRACKET (run-NFA formed "]")))
+  (is (= :BOOLEAN (run-NFA formed "true")))
+  (is (= :BRACKET (run-NFA formed "{"))))
+
 ;; Test forming multiple nfas from multiple strings
 (deftest multiple-nfas-function-test
   (def full-nfa (form-multiple-nfas :KEYWORD "int" "if"))
@@ -12,7 +22,6 @@
   (is (= false (run-NFA full-nfa "in")))
   (is (= false (run-NFA full-nfa "nt"))))
 
-
 ;; Test function forming individual nfa
 (deftest function-test
   (def int-nfa-test (string-to-nfa "int" :INT))