Improve parser - generate prims from globals

[clnl] / src / main / model.lisp

diff --git a/src/main/model.lisp b/src/main/model.lisp
index a9de7be5081ac10b86555cc321f9c020ec8037d8..33f90aa588327b040c5b87a02b1f85efb21223b5 100644 (file)
--- a/src/main/model.lisp
+++ b/src/main/model.lisp
@@ -54,7 +54,15 @@ DESCRIPTION:
           (read-sections (append section (list line))))))))
      (read-sections))))
   (make-model
-   :code (format nil "~{~A~^~%~}" (nth 0 sections))
+   :code (clnl-code-parser:parse
+          (clnl-lexer:lex (format nil "~{~A~^~%~}" (nth 0 sections)))
+          (remove nil
+           (mapcar
+            (lambda (widget)
+             (typecase widget
+              (slider (intern (string-upcase (slider-varname widget)) (find-package :keyword)))
+              (switch (intern (string-upcase (switch-varname widget)) (find-package :keyword)))))
+            (parse-interface (nth 1 sections)))))
    :interface (parse-interface (nth 1 sections))
    :info (nth 2 sections)
    :turtle-shapes (nth 3 sections)
@@ -222,9 +230,6 @@ DESCRIPTION:
    :ymin (view-min-pycor view)
    :ymax (view-max-pycor view))))
 
-(defun parse-code (model)
- (clnl-code-parser:parse (clnl-lexer:lex (model-code model))))
-
 ; For now, we keep the code hidden in this package
 (defun globals (model)
  "GLOBALS MODEL => GLOBALS
@@ -247,7 +252,7 @@ DESCRIPTION:
     (intern (string-upcase (car pair)) clnl:*model-package*)
     (cadr pair)))
   (append
-   (clnl-code-parser:globals (parse-code model))
+   (clnl-code-parser:globals (model-code model))
    (remove nil
     (mapcar
      (lambda (widget)