Author: coke
Date: Wed Nov 12 20:43:58 2008
New Revision: 32590
Modified:
trunk/languages/lisp/cl.pir
trunk/languages/lisp/eval.pir
trunk/languages/lisp/include/macros/standard.pir
trunk/languages/lisp/include/macros/types.pir
trunk/languages/lisp/internals.pir
trunk/languages/lisp/lisp.pir
trunk/languages/lisp/read.pir
trunk/languages/lisp/system.pir
trunk/languages/lisp/types.pir
trunk/languages/lisp/validate.pir
Log:
[lisp] remove unsupported .return syntax, and [DEPRECATED] bare method names
Modified: trunk/languages/lisp/cl.pir
==============================================================================
--- trunk/languages/lisp/cl.pir (original)
+++ trunk/languages/lisp/cl.pir Wed Nov 12 20:43:58 2008
@@ -17,17 +17,17 @@
store_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)
+ 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
.local pmc nil
- nil = package._intern_symbol("NIL") # Create the NIL
symbol
- nil._set_value(nil)
- nil._set_package(package)
- nil._set_special(t)
+ 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
.INTEGER(value,1)
@@ -161,16 +161,16 @@
goto INVALID_FUNCTION_NAME
CAR_IS_FUNCTION:
- .return _FUNCTION_CALL(car, args_of_func)
+ .tailcall _FUNCTION_CALL(car, args_of_func)
CAR_IS_SYMBOL:
.local pmc func
- func = car._get_function() # Get the function from symbol
+ func = car.'_get_function'() # Get the function from
symbol
if_null func, INVALID_FUNCTION_NAME # Throw an error if undefined
type = typeof func
# print type
# print ' for CAR_IS_SYMBOL'
- .return _FUNCTION_CALL(func,args_of_func)
+ .tailcall _FUNCTION_CALL(func,args_of_func)
INVALID_FUNCTION_NAME:
.ERROR_1("undefined-function", "%s is not a function name", car)
@@ -229,7 +229,7 @@
.CAR(symbol, args)
.ASSERT_TYPE(symbol, "symbol")
- val = symbol._get_value()
+ val = symbol.'_get_value'()
if_null val, UNBOUND
.TRUE(retv)
@@ -402,12 +402,12 @@
SYMBOL:
.local string symname
- symname = form._get_name_as_string() # Retrieve the symbols name
+ symname = form.'_get_name_as_string'() # Retrieve the symbols name
.local pmc package
- package = form._get_package() # Retrieve the symbols
package name
+ package = form.'_get_package'() # Retrieve the symbols
package name
.local string pkgname
- pkgname = package._get_name_as_string()
+ pkgname = package.'_get_name_as_string'()
.local pmc symbol
symbol = _LOOKUP_GLOBAL(pkgname, symname) # Lookup the symbol
@@ -416,7 +416,7 @@
found = defined symbol # Ensure the symbol was found
in
unless found goto FUNCTION_NOT_FOUND # the global namespace
- retv = symbol._get_function() # Ensure the symbol had a
function
+ retv = symbol.'_get_function'() # Ensure the symbol had a
function
defined found, symbol # defined
unless found goto FUNCTION_NOT_FOUND
@@ -456,7 +456,7 @@
.ASSERT_LENGTH_BETWEEN(args, 0, 1, ERROR_NARGS)
symbol = _LOOKUP_GLOBAL("COMMON-LISP", "*GENSYM-COUNTER*")
- gcnt = symbol._get_value()
+ gcnt = symbol.'_get_value'()
suffix = gcnt
prefix = "G"
@@ -690,7 +690,7 @@
inc i
value = keyvals[i] # Pop value of key/val list
- name = symbol._get_name_as_string()
+ name = symbol.'_get_name_as_string'()
test = _IS_SPECIAL(symbol)
if test == 0 goto BIND_LEXICAL
@@ -703,10 +703,10 @@
goto BIND_LOOP
BIND_DYNAMIC:
- package = symbol._get_package() # Get dynamic symbols package
+ package = symbol.'_get_package'() # Get dynamic symbols
package
- symbol = package._shadow_symbol(name) # Shadow the symbol
- symbol._set_value(value) # Set the new value
+ symbol = package.'_shadow_symbol'(name) # Shadow the symbol
+ symbol.'_set_value'(value) # Set the new value
push dynvars, symbol # Keep around for tracking
@@ -748,10 +748,10 @@
if i >= nvar goto CLEANUP_DONE
symbol = dynvars[i] # Symbol to be unshadowed
- name = symbol._get_name_as_string()
- package = symbol._get_package()
+ name = symbol.'_get_name_as_string'()
+ package = symbol.'_get_package'()
- package._unshadow_symbol(name) # Unshadow the symbol
+ package.'_unshadow_symbol'(name) # Unshadow the symbol
inc i
goto CLEANUP_LOOP
@@ -930,7 +930,7 @@
.ASSERT_TYPE(symbol, "symbol") # Ensure variable is a symbol
- name = symbol._get_name_as_string() # Get the symbols name
+ name = symbol.'_get_name_as_string'() # Get the symbols name
lexical = _LOOKUP_LEXICAL(name) # Look for it in lexical env
if_null lexical, SET_SYMBOL_VALUE
@@ -940,7 +940,7 @@
.LIST_1(earg, value) # Evaluate the value form
retv = _eval(earg)
- symbol._set_value(retv)
+ symbol.'_set_value'(retv)
.CDR(lptr, lptr)
.CDR(lptr, lptr)
Modified: trunk/languages/lisp/eval.pir
==============================================================================
--- trunk/languages/lisp/eval.pir (original)
+++ trunk/languages/lisp/eval.pir Wed Nov 12 20:43:58 2008
@@ -44,7 +44,7 @@
.ASSERT_TYPE_AND_BRANCH(symbol, "symbol", FUNCTION_NOT_FOUND)
# Retrieve the function from the symbol.
- function = symbol._get_function()
+ function = symbol.'_get_function'()
# If the function wasn't set for the symbol, throw an error.
defined found, function
@@ -77,7 +77,7 @@
goto FUNCTION_LOOP
FUNCTION_CALL:
- .return _FUNCTION_CALL(function,funcargs)
+ .tailcall _FUNCTION_CALL(function,funcargs)
# VALID_IN_PARROT_0_2_0 goto DONE
FUNCTION_NOT_FOUND:
@@ -105,7 +105,7 @@
macrosym = _LOOKUP_SYMBOL("*MACROEXPAND-HOOK*")
if_null macrosym, MACRO_NOT_INITIALIZED
- macroexp = macrosym._get_value() # Get the expander function
+ macroexp = macrosym.'_get_value'() # Get the expander function
.ASSERT_TYPE_AND_BRANCH(macroexp, "function", MACRO_NOT_INITIALIZED)
# VALID_IN_PARROT_0_2_0 peek_pad macroenv # Get
current lexical scope
@@ -121,7 +121,7 @@
SYMBOL:
symbol = form
- symname = symbol._get_name_as_string()
+ symname = symbol.'_get_name_as_string'()
.local int is_special
is_special = _IS_SPECIAL(symbol) # Check if we're a dynamic
@@ -131,8 +131,8 @@
DYNAMIC_SYMBOL:
.local pmc package
.local string pkgname
- package = symbol._get_package()
- pkgname = package._get_name_as_string()
+ package = symbol.'_get_package'()
+ pkgname = package.'_get_name_as_string'()
symbol = _LOOKUP_GLOBAL(pkgname, symname)
goto CHECK_VALUE
@@ -144,7 +144,7 @@
goto CHECK_VALUE
CHECK_VALUE:
- retv = symbol._get_value() # Check for symbol's value
+ retv = symbol.'_get_value'() # Check for symbol's value
defined found, retv
unless found goto SYMBOL_NOT_FOUND
Modified: trunk/languages/lisp/include/macros/standard.pir
==============================================================================
--- trunk/languages/lisp/include/macros/standard.pir (original)
+++ trunk/languages/lisp/include/macros/standard.pir Wed Nov 12 20:43:58 2008
@@ -55,15 +55,15 @@
_specialformp = new "LispSpecialForm"
# VALID_IN_PARROT_0_2_0 _specialformp._set_body(.L)
.const 'Sub' _special_func = .L
- _specialformp._set_body(_special_func)
+ _specialformp.'_set_body'(_special_func)
_namep = new "LispString"
_namep = .N
- _specialformp._set_name(_namep)
+ _specialformp.'_set_name'(_namep)
- .S = .P._intern_symbol(.N)
- .S._set_function(_specialformp)
- .S._set_package(.P)
+ .S = .P.'_intern_symbol'(.N)
+ .S.'_set_function'(_specialformp)
+ .S.'_set_package'(.P)
.endm
.macro DEFUN (S,P,N,L)
@@ -74,11 +74,11 @@
_namep = new "LispString"
_namep = .N
- _functionp._set_name(_namep)
+ _functionp.'_set_name'(_namep)
- .S = .P._intern_symbol(.N)
- .S._set_function(_functionp)
- .S._set_package(.P)
+ .S = .P.'_intern_symbol'(.N)
+ .S.'_set_function'(_functionp)
+ .S.'_set_package'(.P)
.endm
.macro DEFMACRO (S,P,N,L)
@@ -89,11 +89,11 @@
_namep = new "LispString"
_namep = .N
- _macrop._set_name(_namep)
+ _macrop.'_set_name'(_namep)
- .S = .P._intern_symbol(.N)
- .S._set_function(_macrop)
- .S._set_package(.P)
+ .S = .P.'_intern_symbol'(.N)
+ .S.'_set_function'(_macrop)
+ .S.'_set_package'(.P)
.endm
.macro DEFVAR (S,P,N,V)
@@ -101,10 +101,10 @@
.TRUE(_specialp)
- .S = .P._intern_symbol(.N)
- .S._set_value(.V)
- .S._set_package(.P)
- .S._set_special(_specialp)
+ .S = .P.'_intern_symbol'(.N)
+ .S.'_set_value'(.V)
+ .S.'_set_package'(.P)
+ .S.'_set_special'(_specialp)
.endm
# Local Variables:
Modified: trunk/languages/lisp/include/macros/types.pir
==============================================================================
--- trunk/languages/lisp/include/macros/types.pir (original)
+++ trunk/languages/lisp/include/macros/types.pir Wed Nov 12 20:43:58 2008
@@ -43,7 +43,7 @@
.macro STREAM(R,S)
.R = new "LispStream"
- .R._set_io(.S)
+ .R.'_set_io'(.S)
.endm
=head2 .READTABLE(R)
Modified: trunk/languages/lisp/internals.pir
==============================================================================
--- trunk/languages/lisp/internals.pir (original)
+++ trunk/languages/lisp/internals.pir Wed Nov 12 20:43:58 2008
@@ -24,7 +24,7 @@
find_global package, "PACKAGES", pkgname # Look for the package
pop_eh
- retv = package._lookup_symbol(symname) # Lookup the symbol
+ retv = package.'_lookup_symbol'(symname) # Lookup the symbol
goto DONE
@@ -81,10 +81,10 @@
symbol = _LOOKUP_GLOBAL("COMMON-LISP", "*PACKAGE*")
if_null symbol, PACKAGE_NOT_FOUND
- package = symbol._get_value()
+ package = symbol.'_get_value'()
if_null package, PACKAGE_NOT_FOUND
- pkgname = package._get_name_as_string()
+ pkgname = package.'_get_name_as_string'()
retv = _LOOKUP_GLOBAL(pkgname, symname)
goto DONE
@@ -108,7 +108,7 @@
.local string symname
- symname = symbol._get_name_as_string()
+ symname = symbol.'_get_name_as_string'()
store_global pkgname, symname, symbol
.end
@@ -123,7 +123,7 @@
.local string symname
- symname = symbol._get_name_as_string()
+ symname = symbol.'_get_name_as_string'()
# VALID_IN_PARROT_0_2_0 store_lex -1, symname, symbol
store_lex symname, symbol
@@ -143,15 +143,15 @@
.local int test
symbol = _LOOKUP_GLOBAL("COMMON-LISP", "*PACKAGE*")
- package = symbol._get_value()
+ package = symbol.'_get_value'()
symbol = _SYMBOL(symname) # Create a new symbol
- symbol._set_package(package) # Set the home package
+ symbol.'_set_package'(package) # Set the home package
defined test, value # Set a value if provided
if test == 0 goto DONE
- symbol._set_value(value)
+ symbol.'_set_value'(value)
goto DONE
DONE:
@@ -176,7 +176,7 @@
name = new "LispString"
name = symname
- symbol._set_name(name)
+ symbol.'_set_name'(name)
.return(symbol)
.end
@@ -204,21 +204,21 @@
find_global package, "PACKAGES", pkgname
pop_eh
- symbol = package._intern_symbol(symname)
- symbol._set_package(package) # Set the home package
+ symbol = package.'_intern_symbol'(symname)
+ symbol.'_set_package'(package) # Set the home package
defined test, value # Set a value if provided
if test == 0 goto FUNCTION
- symbol._set_value(value)
+ symbol.'_set_value'(value)
goto FUNCTION
FUNCTION: # Set a function if provided
defined test, function
if test == 0 goto DONE
- function._set_name(symname)
- symbol._set_function(function)
+ function.'_set_name'(symname)
+ symbol.'_set_function'(function)
goto DONE
PACKAGE_NOT_CREATED:
@@ -240,9 +240,9 @@
.param pmc args
.local pmc proto
- proto = function._get_args()
+ proto = function.'_get_args'()
.local pmc body
- body = function._get_body()
+ body = function.'_get_body'()
.local string type
type = typeof function # Get the function type
@@ -260,19 +260,19 @@
# print type
# print " is the type\n"
if type != 'Sub' goto NOT_A_COMPILED_FUNCTION
- .return body( args )
+ .tailcall body( args )
NOT_A_COMPILED_FUNCTION:
if type != 'LispCons' goto NOT_A_LISP_CONS
.local pmc scope
- scope = function._get_scope()
+ scope = function.'_get_scope'()
# 1st arg - the code to evaluate
# 2nd arg - the arg prototype
# 3rd arg - the args to evaluate
# The closure
# set_args "0,0,0", body, proto, args
- .return scope( body, proto, args )
+ .tailcall scope( body, proto, args )
# VALID_IN_PARROT_0_2_0 pushtopp # Save the
upper registers
# VALID_IN_PARROT_0_2_0 invokecc # Call the
closure
# VALID_IN_PARROT_0_2_0 poptopp # Restore
the upper registers
@@ -368,9 +368,9 @@
.local pmc lisp_function
lisp_function = new "LispFunction"
- lisp_function._set_args(args)
- lisp_function._set_body(body)
- lisp_function._set_scope(closure)
+ lisp_function.'_set_args'(args)
+ lisp_function.'_set_body'(body)
+ lisp_function.'_set_scope'(closure)
.return(lisp_function)
.end
@@ -410,7 +410,7 @@
.CAR(clval, clargsptr) # The lexical value
.CAR(clarg, clprotptr) # The lexical arg prototype
- clsymname = clarg._get_name_as_string()
+ clsymname = clarg.'_get_name_as_string'()
clsym = _LEXICAL_SYMBOL(clsymname, clval) # Create a new lexical symbol
.CDR(clargsptr, clargsptr)
@@ -428,7 +428,7 @@
.LIST_1(clearg, clbody)
# VALID_IN_PARROT_0_2_0 pop_pad
- .return _eval(clearg)
+ .tailcall _eval(clearg)
CLOSURE_TOO_FEW_ARGS:
# VALID_IN_PARROT_0_2_0 pop_pad
Modified: trunk/languages/lisp/lisp.pir
==============================================================================
--- trunk/languages/lisp/lisp.pir (original)
+++ trunk/languages/lisp/lisp.pir Wed Nov 12 20:43:58 2008
@@ -90,7 +90,7 @@
.local pmc symbol
symbol = _LOOKUP_GLOBAL("COMMON-LISP", "*STANDARD-INPUT*")
.local pmc stdin
- stdin = symbol._get_value()
+ stdin = symbol.'_get_value'()
push_eh DEBUGGER # Setup error handler for debug loop.
Modified: trunk/languages/lisp/read.pir
==============================================================================
--- trunk/languages/lisp/read.pir (original)
+++ trunk/languages/lisp/read.pir Wed Nov 12 20:43:58 2008
@@ -37,16 +37,16 @@
# the input stream to read from.
.CAR(istream, args)
- stream = istream._get_io()
+ stream = istream.'_get_io'()
symbol = _LOOKUP_GLOBAL("SYSTEM", "*READER-MACROS*")
- readmacros = symbol._get_value()
+ readmacros = symbol.'_get_value'()
symbol = _LOOKUP_GLOBAL("COMMON-LISP", "*READTABLE*")
- readobj = symbol._get_value()
+ readobj = symbol.'_get_value'()
- readtable = readobj._get_table()
- readcase = readobj._get_case()
+ readtable = readobj.'_get_table'()
+ readcase = readobj.'_get_case'()
.local string char
.local int ordv
@@ -223,20 +223,20 @@
GET_STDIN:
symbol = _LOOKUP_GLOBAL("COMMON-LISP", "*STANDARD-INPUT*")
- istream = symbol._get_value()
+ istream = symbol.'_get_value'()
goto DONE_ARGS
DONE_ARGS:
.ASSERT_TYPE_AND_BRANCH(istream, "stream", ERROR_NONSTREAM)
- stream = istream._get_io()
+ stream = istream.'_get_io'()
symbol = _LOOKUP_GLOBAL("SYSTEM", "*READER-MACROS*")
- readmacros = symbol._get_value()
+ readmacros = symbol.'_get_value'()
symbol = _LOOKUP_GLOBAL("COMMON-LISP", "*READTABLE*")
- readobj = symbol._get_value()
+ readobj = symbol.'_get_value'()
- readtable = readobj._get_table()
+ readtable = readobj.'_get_table'()
.NIL(retv) # Initialize the return to NIL
lptr = retv
@@ -402,7 +402,7 @@
.local pmc stream
.CAR(stream, args) # Get the input stream off the args
.local pmc istream
- istream = stream._get_io()
+ istream = stream.'_get_io'()
.local string char
LOOP:
@@ -426,14 +426,14 @@
.local pmc stream
.CAR(stream, args) # Get the input stream off the args
.local pmc istream
- istream = stream._get_io()
+ istream = stream.'_get_io'()
.local pmc symbol
symbol = _LOOKUP_GLOBAL("COMMON-LISP", "*READTABLE*")
.local pmc readtable
- readtable = symbol._get_value()
+ readtable = symbol.'_get_value'()
.local pmc table
- table = readtable._get_table()
+ table = readtable.'_get_table'()
.local string strtok
strtok = ""
@@ -511,14 +511,14 @@
.local pmc func
.CAR(stream,args)
- istream = stream._get_io()
+ istream = stream.'_get_io'()
read char, istream, 1
symbol = _LOOKUP_GLOBAL("SYSTEM", "*DISPATCHING-MACROS*")
.ASSERT_TYPE_AND_BRANCH(symbol, "symbol", MACRO_NOT_INITIALIZED)
- macros = symbol._get_value()
+ macros = symbol.'_get_value'()
.ASSERT_TYPE_AND_BRANCH(macros, "hash", MACRO_NOT_INITIALIZED)
macro = macros[char]
Modified: trunk/languages/lisp/system.pir
==============================================================================
--- trunk/languages/lisp/system.pir (original)
+++ trunk/languages/lisp/system.pir Wed Nov 12 20:43:58 2008
@@ -166,7 +166,7 @@
.ASSERT_TYPE(pkg, "package")
.local pmc pkgname
- pkgname = pkg._get_name()
+ pkgname = pkg.'_get_name'()
goto DONE
@@ -287,7 +287,7 @@
.ASSERT_TYPE(intopkg, "package")
.ASSERT_TYPE(frompkg, "package")
- exports = frompkg._get_exports()
+ exports = frompkg.'_get_exports'()
iter i, exports
@@ -297,8 +297,8 @@
shift symname, i
symnames = symname
- symbol = frompkg._lookup_symbol(symnames)
- intopkg._import_symbol(symbol)
+ symbol = frompkg.'_lookup_symbol'(symnames)
+ intopkg.'_import_symbol'(symbol)
goto LOOP
@@ -336,7 +336,7 @@
.ASSERT_TYPE(symbol, "string")
symname = symbol
- package._export_symbol(symname)
+ package.'_export_symbol'(symname)
.CDR(symbols, symbols)
goto LOOP
@@ -571,7 +571,7 @@
.CAR(stream, args)
.ASSERT_TYPE(stream, "stream")
- io = stream._get_io()
+ io = stream.'_get_io'()
peek char, io
if char == "" goto ERROR_EOF
@@ -603,7 +603,7 @@
.CAR(stream, args)
.ASSERT_TYPE(stream, "stream")
- io = stream._get_io()
+ io = stream.'_get_io'()
close io
.TRUE(retv)
@@ -670,14 +670,14 @@
macro = new "LispMacro"
- val = form._get_args()
- macro._set_args(val)
+ val = form.'_get_args'()
+ macro.'_set_args'(val)
- val = form._get_scope()
- macro._set_scope(val)
+ val = form.'_get_scope'()
+ macro.'_set_scope'(val)
- val = form._get_body()
- macro._set_body(val)
+ val = form.'_get_body'()
+ macro.'_set_body'(val)
goto DONE
Modified: trunk/languages/lisp/types.pir
==============================================================================
--- trunk/languages/lisp/types.pir (original)
+++ trunk/languages/lisp/types.pir Wed Nov 12 20:43:58 2008
@@ -159,7 +159,7 @@
.local pmc tmps
.local pmc name
- name = self._get_name()
+ name = self.'_get_name'()
.local int test
defined test, name
@@ -246,7 +246,7 @@
.local pmc stack
.local pmc hash
- symname = symbol._get_name_as_string()
+ symname = symbol.'_get_name_as_string'()
hash = getattribute self, "internal"
@@ -279,7 +279,7 @@
stack = hash[name]
symbol = _SYMBOL(name)
- symbol._set_package(self)
+ symbol.'_set_package'(self)
push stack, symbol
@@ -352,7 +352,7 @@
goto DONE
SYMBOL_NOT_FOUND:
- symbol = self._intern_symbol(name)
+ symbol = self.'_intern_symbol'(name)
stack = internal[name]
external[name] = stack
Modified: trunk/languages/lisp/validate.pir
==============================================================================
--- trunk/languages/lisp/validate.pir (original)
+++ trunk/languages/lisp/validate.pir Wed Nov 12 20:43:58 2008
@@ -56,10 +56,10 @@
symbol = _LOOKUP_GLOBAL("COMMON-LISP", "*PACKAGE*")
if_null symbol, PACKAGE_NOT_FOUND
- package = symbol._get_value() # Get the current package
+ package = symbol.'_get_value'() # Get the current package
if_null package, PACKAGE_NOT_FOUND
- pkgname = package._get_name_as_string()
+ pkgname = package.'_get_name_as_string'()
symname = token
retv = _LOOKUP_GLOBAL(pkgname, symname)
