looks like vars work

1 files changed, 24 insertions, 4 deletions

diff --git a/app/Compiler.hs b/app/Compiler.hs
index 08e4b24..4f94637 100644
--- a/app/Compiler.hs
+++ b/app/Compiler.hs
@@ -1,5 +1,7 @@
 module Compiler where
 
+import Data.Char (isUpper)
+import Data.Containers.ListUtils (nubOrd)
 import Data.List
 import Interpreter (Code, Datum(..), Id(..), Instr(..), StrTable, strtablize)
 
@@ -10,13 +12,29 @@ data PrlgStr
 
 data PrlgInt
   = CallI Id [PrlgInt]
-  | LiteralI Int --split off vars here later
+  | LiteralI Int
+  | VarI Int Int
+  | VoidI
   deriving (Show)
 
-strtablizePrlg :: StrTable -> PrlgStr -> (StrTable, PrlgInt)
-strtablizePrlg = go
+varname :: String -> Bool
+varname ('_':_) = True
+varname (c:_) = isUpper c
+varname _ = False
+
+varnames :: PrlgStr -> [String]
+varnames (CallS _ xs) = nubOrd $ concatMap varnames xs
+varnames (LiteralS x)
+  | varname x = [x]
+  | otherwise = []
+
+strtablizePrlg :: [String] -> StrTable -> PrlgStr -> (StrTable, PrlgInt)
+strtablizePrlg stab = go
   where
-    go t (LiteralS str) = LiteralI <$> strtablize t str
+    go t (LiteralS str)
+      | str == "_" = (t, VoidI)
+      | Just idx <- elemIndex str stab = VarI idx <$> strtablize t str
+      | otherwise = LiteralI <$> strtablize t str
     go t (CallS str ps) =
       let (t', i) = strtablize t str
        in CallI (Id i $ length ps) <$> mapAccumL go t' ps
@@ -35,6 +53,8 @@ compileGoal x = compileArg x
 compileArg :: PrlgInt -> Code
 compileArg (CallI x args) = U (Struct x) : concatMap compileArg args
 compileArg (LiteralI x) = [U (Atom x)]
+compileArg (VarI x _) = [U (LocalRef x)]
+compileArg VoidI = [U VoidRef]
 
 seqGoals :: [Code] -> Code
 seqGoals [] = [NoGoal]