X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain%2Fcode-parse.lisp;h=b2a9e4508e89039f8ae91f5cd2b08910201c6480;hb=31f7cb6;hp=7d9c42c69a21da7815d34ddd19a663e6f153be0a;hpb=1e4bdde8e36b29b411b6a113f586d040abac331f;p=clnl diff --git a/src/main/code-parse.lisp b/src/main/code-parse.lisp index 7d9c42c..b2a9e45 100644 --- a/src/main/code-parse.lisp +++ b/src/main/code-parse.lisp @@ -7,7 +7,13 @@ ; other things (defvar *dynamic-prims* nil) -(defun global->prim (global) (list :name global)) + +(defun global->prim (global) + (list :name global :type :reporter :macro `(lambda () ',(intern (symbol-name global) clnl:*model-package*)))) + +(defun own->prim (symb) + (list :name symb :type :reporter :macro `(lambda () '(clnl-nvm:agent-value ,symb)))) + (defun breed->prims (breed-list) (let ((plural-name (symbol-name (car breed-list)))) @@ -17,17 +23,21 @@ (list :name (intern (format nil "CREATE-~A" plural-name) :keyword) :args '(:number :command-block))))) (defun parse (lexed-ast &optional external-globals) - "PARSE LEXED-AST &optional EXTERNAL-GLOBALS => AST + "PARSE LEXED-AST &optional EXTERNAL-GLOBALS => AST, PRIMS ARGUMENTS AND VALUES: LEXED-AST: An ambigious ast EXTERNAL-GLOBALS: A list of symbols in keyword package AST: An unambigious ast that represents the code block of a model + PRIMS: Primitives that can be sent to the parser and transpiler DESCRIPTION: PARSE takes a ambigious LEXED-AST and converts it to an unambigious one. + It also returns the primitives that are defined in the code file, including + ones generated from the EXTERNAL-GLOBALS, that can then be passed to both + the parser and the transpiler. EXTERNAL-GLOBALS is a list of symbols representing global variables that are not defined within the code. Normally these come from widgets defined @@ -38,23 +48,33 @@ DESCRIPTION: Rather, the ast that's returned can be queried with other functions included 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 + (let* ((*dynamic-prims* (append (mapcar #'global->prim external-globals) - (procedures->prims lexed-ast)))) - (parse-internal lexed-ast))) + (procedures->prims lexed-ast))) + (parsed (parse-internal lexed-ast))) + (values + (butlast parsed) + (car (last parsed))))) (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))))) + ((eql :to (car lexed-ast)) + (cons + (list + :name (cadr lexed-ast) + :type :command + :func `(function ,(intern (symbol-name (cadr lexed-ast)) clnl:*model-package*))) + (procedures->prims (cddr lexed-ast)))) + (t (procedures->prims (cdr lexed-ast))))) (defun parse-internal (lexed-ast) (cond - ((not lexed-ast) nil) + ((not lexed-ast) + (list *dynamic-prims*)) ((eql :to (car lexed-ast)) (parse-procedure lexed-ast)) ((find (car lexed-ast) '(:globals :turtles-own :patches-own)) (parse-with-unevaluated-list lexed-ast)) @@ -85,7 +105,15 @@ DESCRIPTION: (cons (list (car lexed-ast) (cons :list-literal in-list)) (let - ((*dynamic-prims* (append (mapcar #'global->prim in-list) *dynamic-prims*))) + ((*dynamic-prims* + (append + (mapcar + (case (car lexed-ast) + (:globals #'global->prim) + (:turtles-own #'own->prim) + (:patches-own #'own->prim) + (t #'global->prim)) + in-list) *dynamic-prims*))) (parse-internal after-list))))) (defun parse-breed (lexed-ast) @@ -106,18 +134,73 @@ DESCRIPTION: (values (cons (car tokens) in-block) after-block))))) (defun globals (code-parsed-ast) - "GLOBALS MODEL => GLOBALS + "GLOBALS CODE-PARSED-AST => GLOBALS GLOBALS: GLOBAL* ARGUMENTS AND VALUES: - MODEL: An ast as created by clnl-code-parse:parse - GLOBAL: A symbol interned in clnl:*model-package* + CODE-PARSED-AST: An ast as created by clnl-code-parse:parse + GLOBAL: A symbol interned in :keyword DESCRIPTION: Returns the globals that get declared in the code." (mapcar - (lambda (global) (list (intern (symbol-name global) clnl:*model-package*) 0d0)) + (lambda (global) (list (intern (symbol-name global) :keyword) 0d0)) (cdr (second (find :globals code-parsed-ast :key #'car))))) + +(defun turtles-own-vars (code-parsed-ast) + "TURTLES-OWN-VARS CODE-PARSED-AST => TURTLES-OWN-VARS + + TURTLES-OWN-VARS: TURTLES-OWN-VAR* + +ARGUMENTS AND VALUES: + + CODE-PARSED-AST: An ast as created by clnl-code-parse:parse + TURTLES-OWN-VAR: A symbol interned in :keyword + +DESCRIPTION: + + Returns the turtles own variables that get declared in the code." + (mapcar + (lambda (turtles-own-var) (intern (symbol-name turtles-own-var) :keyword)) + (cdr (second (find :turtles-own code-parsed-ast :key #'car))))) + +(defun patches-own-vars (code-parsed-ast) + "PATCHES-OWN-VARS CODE-PARSED-AST => PATCHES-OWN-VARS + + PATCHES-OWN-VARS: PATCHES-OWN-VAR* + +ARGUMENTS AND VALUES: + + CODE-PARSED-AST: An ast as created by clnl-code-parse:parse + PATCHES-OWN-VAR: A symbol interned in :keyword + +DESCRIPTION: + + Returns the turtles own variables that get declared in the code." + (mapcar + (lambda (patches-own-var) (intern (symbol-name patches-own-var) :keyword)) + (cdr (second (find :patches-own code-parsed-ast :key #'car))))) + +(defun procedures (code-parsed-ast) + "PROCEDURES CODE-PARSED-AST => PROCEDURES + + PROCEDURES: PROCEDURE* + PROCEDURE: (NAME BODY) + +ARGUMENTS AND VALUES: + + CODE-PARSED-AST: An ast as created by clnl-code-parse:parse + NAME: A symbol interned in :keyword + BODY: A list of lexed forms + +DESCRIPTION: + + Returns the procedures that were defined in the code. These can + then be translated into common lisp by using mapcar on the BODY, and + set to some function defined by NAME" + (mapcar + (lambda (proc) (cdr proc)) + (remove-if-not (lambda (form) (find (car form) '(:to :to-report))) code-parsed-ast)))