[svn:parrot] r37136 - in trunk/languages/lisp: . include/macros

fperrad at svn.parrot.org fperrad at svn.parrot.org
Thu Mar 5 20:09:30 UTC 2009


Author: fperrad
Date: Thu Mar  5 20:09:29 2009
New Revision: 37136
URL: https://trac.parrot.org/parrot/changeset/37136

Log:
[lisp] update PIR syntax :
- replace store/find_global by set/get_global
- problem when the namespace is a variable

Modified:
   trunk/languages/lisp/cl.pir
   trunk/languages/lisp/include/macros/standard.pir
   trunk/languages/lisp/internals.pir
   trunk/languages/lisp/system.pir

Modified: trunk/languages/lisp/cl.pir
==============================================================================
--- trunk/languages/lisp/cl.pir	Thu Mar  5 20:02:59 2009	(r37135)
+++ trunk/languages/lisp/cl.pir	Thu Mar  5 20:09:29 2009	(r37136)
@@ -13,22 +13,22 @@
 
     .local pmc package
     .PACKAGE(package, "COMMON-LISP")
-    store_global "PACKAGES", "COMMON-LISP", package
-    store_global "PACKAGES", "CL", package
+    set_global ["PACKAGES"], "COMMON-LISP", package
+    set_global ["PACKAGES"], "CL", package
 
     .local pmc t
     t = package.'_intern_symbol'("T")                      # Create the T symbol, T meaning true
     t.'_set_value'(t)
     t.'_set_package'(package)
     t.'_set_special'(t)
-    store_global "SYMBOLS", "T", t                       # Quick alias to T
+    set_global ["SYMBOLS"], "T", t                       # Quick alias to T
 
     .local pmc nil
     nil = package.'_intern_symbol'("NIL")                  # Create the NIL symbol
     nil.'_set_value'(nil)
     nil.'_set_package'(package)
     nil.'_set_special'(t)
-    store_global "SYMBOLS", "NIL",  nil                  # Quick alias to NIL
+    set_global ["SYMBOLS"], "NIL",  nil                  # Quick alias to NIL
 
     .INTEGER(value,1)
     .DEFVAR(symbol, package, "*GENSYM-COUNTER*", value)

Modified: trunk/languages/lisp/include/macros/standard.pir
==============================================================================
--- trunk/languages/lisp/include/macros/standard.pir	Thu Mar  5 20:02:59 2009	(r37135)
+++ trunk/languages/lisp/include/macros/standard.pir	Thu Mar  5 20:09:29 2009	(r37136)
@@ -17,7 +17,7 @@
 =cut
 
 .macro NIL (R)
-  find_global .R, "SYMBOLS", "NIL"
+  get_global .R, ["SYMBOLS"], "NIL"
 .endm
 
 =head2 .TRUE(R)
@@ -27,7 +27,7 @@
 =cut
 
 .macro TRUE (R)
-  find_global .R, "SYMBOLS", "T"
+  get_global .R, ["SYMBOLS"], "T"
 .endm
 
 .macro CONSTANT (P)

Modified: trunk/languages/lisp/internals.pir
==============================================================================
--- trunk/languages/lisp/internals.pir	Thu Mar  5 20:02:59 2009	(r37135)
+++ trunk/languages/lisp/internals.pir	Thu Mar  5 20:09:29 2009	(r37136)
@@ -21,7 +21,7 @@
   upcase symname, symname
 
   push_eh PACKAGE_NOT_FOUND                     # Set an error handler
-  find_global package, "PACKAGES", pkgname      # Look for the package
+  get_global package, ["PACKAGES"], pkgname     # Look for the package
   pop_eh
 
   retv = package.'_lookup_symbol'(symname)        # Lookup the symbol
@@ -110,7 +110,7 @@
 
   symname = symbol.'_get_name_as_string'()
 
-  store_global pkgname, symname, symbol
+  set_global pkgname, symname, symbol
 .end
 
 
@@ -201,7 +201,7 @@
   upcase symname, symname
 
   push_eh PACKAGE_NOT_CREATED
-  find_global package, "PACKAGES", pkgname
+  get_global [package], "PACKAGES", pkgname
   pop_eh
 
   symbol = package.'_intern_symbol'(symname)

Modified: trunk/languages/lisp/system.pir
==============================================================================
--- trunk/languages/lisp/system.pir	Thu Mar  5 20:02:59 2009	(r37135)
+++ trunk/languages/lisp/system.pir	Thu Mar  5 20:09:29 2009	(r37136)
@@ -16,8 +16,8 @@
 
     .PACKAGE(package, "SYSTEM")
 
-     store_global "PACKAGES", "SYSTEM", package
-     store_global "PACKAGES", "SYS",    package
+     set_global ["PACKAGES"], "SYSTEM", package
+     set_global ["PACKAGES"], "SYS",    package
 
     _init_reader_macros( package )
 
@@ -193,7 +193,7 @@
 
      push_eh PACKAGE_NOT_FOUND
      .local pmc retv
-     retv = find_global "PACKAGES", pkgname_str
+     retv = get_global ["PACKAGES"], pkgname_str
      if_null retv, PACKAGE_NOT_FOUND
      pop_eh
 
@@ -227,7 +227,7 @@
     pkgname_str = pkgname
     upcase pkgname_str
 
-    store_global "PACKAGES", pkgname_str, package
+    set_global ["PACKAGES"], pkgname_str, package
 
     .local pmc retv
     .TRUE(retv)
@@ -256,7 +256,7 @@
     pkgname_str = pkgname
     upcase pkgname_str
 
-    store_global "PACKAGES", pkgname_str, package
+    set_global ["PACKAGES"], pkgname_str, package
 
     goto DONE
 


More information about the parrot-commits mailing list