Author: bernhard
Date: Tue Jun 5 11:13:27 2007
New Revision: 18824
Modified:
trunk/languages/lisp/read.pir
trunk/languages/lisp/system.pir
Log:
[languages/lisp]
Replace the two remaining checks for type 'None' with 'if_null' checks.
Modified: trunk/languages/lisp/read.pir
==============================================================================
--- trunk/languages/lisp/read.pir (original)
+++ trunk/languages/lisp/read.pir Tue Jun 5 11:13:27 2007
@@ -165,6 +165,7 @@
.sub _error
.param string type # There's current no way to add more
.param string mesg # than just _message to the exception.
+
.local pmc e
e = new Exception
@@ -176,6 +177,7 @@
.sub _read_delimited_list
.param pmc args
+
.local string dchar
.local string char
.local pmc readmacros
@@ -305,6 +307,7 @@
.sub _left_paren_macro # As described in CLtL section 2.4.1
.param pmc args
+
.local pmc stream
.local pmc delimit
.local pmc rargs
@@ -328,6 +331,7 @@
.sub _single_quote_macro # As described in CLtL section 2.4.3
.param pmc args
+
.local pmc stream
.local pmc symbol
.local pmc rargs
@@ -378,6 +382,7 @@
.sub _double_quote_macro # As described in CLtL section 2.4.5.
.param pmc args
+
.local string strtok
.local pmc istream
.local pmc stream
@@ -448,8 +453,8 @@
.sub _sharpsign_macro # As described in CLtL section 2.4.8
.param pmc args
+
.local string char
- .local string test
.local pmc istream
.local pmc stream
.local pmc symbol
@@ -471,8 +476,7 @@
macro = macros[char]
- typeof test, macro
- if test == "None" goto MACRO_NOT_DEFINED
+ if_null macro, MACRO_NOT_DEFINED
.ASSERT_TYPE(macro, "function")
_FUNCTION_CALL(macro,args)
Modified: trunk/languages/lisp/system.pir
==============================================================================
--- trunk/languages/lisp/system.pir (original)
+++ trunk/languages/lisp/system.pir Tue Jun 5 11:13:27 2007
@@ -138,7 +138,6 @@
.sub _get_hash
.param pmc args
.local string keys
- .local string type
.local pmc hash
.local pmc key
.local pmc val
@@ -154,8 +153,7 @@
keys = key # Convert the key to a
string
val = hash[keys]
- typeof type, val
- if type == "None" goto NO_VALUE_SET
+ if_null val, NO_VALUE_SET
goto DONE
