Improve parser - generate prims from procedures

diff --git a/src/main/code-parse.lisp b/src/main/code-parse.lisp
index 7cdf2b5b1864ff53ea9483a18464e2b906cc56c4..644ef13278f3ea145cdfdeb40ef959dc69c0f3bb 100644 (file)
--- a/src/main/code-parse.lisp
+++ b/src/main/code-parse.lisp
@@ -32,9 +32,19 @@ DESCRIPTION:
   in the CLNL-CODE-PARSER package to tease out necessary information.  Some of
   those things will involve code blocks that can then be transpiled."
  (let
-  ((*dynamic-prims* (mapcar #'global->prim external-globals)))
+  ((*dynamic-prims*
+    (append
+     (mapcar #'global->prim external-globals)
+     (procedures->prims lexed-ast))))
   (parse-internal lexed-ast)))
 
+(defun procedures->prims (lexed-ast)
+ (cond
+  ((not lexed-ast) nil)
+  ; We'll need argument handling here sometime :)
+  ((eql :to (car lexed-ast)) (cons (list :name (cadr lexed-ast)) (procedures-to-prims (cdr lexed-ast))))
+  (t (procedures-to-prims (cdr lexed-ast)))))
+
 (defun parse-internal (lexed-ast)
  (cond
   ((not lexed-ast) nil)

diff --git a/src/main/parse.lisp b/src/main/parse.lisp
index 5c4c2339449480ee88c701050ba5eb4d7a52cc1b..ad9f746a211d8e15bf1d2a3d4e55e2f41ab46531 100644 (file)
--- a/src/main/parse.lisp
+++ b/src/main/parse.lisp
@@ -274,19 +274,6 @@ DESCRIPTION:
 
 ; Placeholder prims that should be populated in dynamic prims
 
-; Generated by procedures
-(defprim :move ())
-(defprim :eat-grass ())
-(defprim :reproduce-sheep ())
-(defprim :reproduce-wolves ())
-(defprim :catch-sheep ())
-(defprim :death ())
-(defprim :grow-grass ())
-(defprim :display-labels ())
-
-; Generated by a let
-;(defprim :prey ())
-
 ; Generated by breeds
 (defprim :sheep ())
 (defprim :wolves ())