Author: bernhard
Date: Tue May 22 12:23:50 2007
New Revision: 18621
Modified:
trunk/languages/lisp/include/macros/types.pir
trunk/languages/lisp/internals.pir
trunk/languages/lisp/system.pir
trunk/languages/lisp/types.pir
Log:
[languages/lisp]
Attributes no longer need a namspace + '\0' as a prefix,
but symbol 'PRINT' is still not found.
Modified: trunk/languages/lisp/include/macros/types.pir
==============================================================================
--- trunk/languages/lisp/include/macros/types.pir (original)
+++ trunk/languages/lisp/include/macros/types.pir Tue May 22 12:23:50 2007
@@ -99,7 +99,8 @@
upcase _ucname, _ucname
.STRING(_name, _ucname)
- setattribute .P, "LispPackage\0name", _name
+ # VALID_IN_PARROT_0_2_0 setattribute .P, "LispPackage\0name", _name
+ setattribute .P, "name", _name
.endm
=head1 .FUNCTION(F,L)
@@ -130,7 +131,8 @@
.F = new "LispMacro"
newsub _func, .Sub, .L
- setattribute .F, "LispMacro\0body", _func
+ # VALID_IN_PARROT_0_2_0 setattribute .F, "LispMacro\0body", _func
+ setattribute .F, "body", _func
.endm
Modified: trunk/languages/lisp/internals.pir
==============================================================================
--- trunk/languages/lisp/internals.pir (original)
+++ trunk/languages/lisp/internals.pir Tue May 22 12:23:50 2007
@@ -267,7 +267,8 @@
retv = 1
- getattribute special, symbol, "LispSymbol\0special"
+ # VALID_IN_PARROT_0_2_0 getattribute special, symbol, "LispSymbol\0special"
+ getattribute special, symbol, "special"
if_null special, NOT_SPECIAL
.NULL(special, NOT_SPECIAL)
Modified: trunk/languages/lisp/system.pir
==============================================================================
--- trunk/languages/lisp/system.pir (original)
+++ trunk/languages/lisp/system.pir Tue May 22 12:23:50 2007
@@ -441,29 +441,30 @@
.sub _get_object_attr
.param pmc args
+
.local string attr
- .local string objt
+ # VALID_IN_PARROT_0_2_0 .local string objt
.local pmc symbol
- .local pmc objstr
+ # VALID_IN_PARROT_0_2_0 .local pmc objstr
.local pmc attrib
.local pmc retv
.ASSERT_LENGTH(args,3,ERROR_NARGS)
.CAR(symbol,args)
- .SECOND(objstr,args)
+ # VALID_IN_PARROT_0_2_0 .SECOND(objstr,args)
.THIRD(attrib,args)
.NIL(retv)
- .ASSERT_TYPE(objstr, "string")
+ # VALID_IN_PARROT_0_2_0 .ASSERT_TYPE(objstr, "string")
.ASSERT_TYPE(attrib, "string")
attr = attrib
- objt = objstr
+ # VALID_IN_PARROT_0_2_0 objt = objstr
- concat objt, objt, "\0"
- concat attr, objt, attr
+ # VALID_IN_PARROT_0_2_0 concat objt, objt, "\0"
+ # VALID_IN_PARROT_0_2_0 concat attr, objt, attr
getattribute retv, symbol, attr
if_null retv, NO_VALUE
@@ -484,27 +485,27 @@
.sub _set_object_attr
.param pmc args
.local string attr
- .local string objt
+ # VALID_IN_PARROT_0_2_0 .local string objt
.local pmc symbol
- .local pmc objstr
+ # VALID_IN_PARROT_0_2_0 .local pmc objstr
.local pmc attrib
.local pmc value
.ASSERT_LENGTH(args,4,ERROR_NARGS)
.CAR(symbol,args)
- .SECOND(objstr,args)
+ # VALID_IN_PARROT_0_2_0 .SECOND(objstr,args)
.THIRD(attrib,args)
.FOURTH(value,args)
- .ASSERT_TYPE(objstr, "string")
+ # VALID_IN_PARROT_0_2_0 .ASSERT_TYPE(objstr, "string")
.ASSERT_TYPE(attrib, "string")
attr = attrib
- objt = objstr
+ # VALID_IN_PARROT_0_2_0 objt = objstr
- concat objt, objt, "\0"
- concat attr, objt, attr
+ # VALID_IN_PARROT_0_2_0 concat objt, objt, "\0"
+ # VALID_IN_PARROT_0_2_0 concat attr, objt, attr
setattribute symbol, attr, value
goto DONE
Modified: trunk/languages/lisp/types.pir
==============================================================================
--- trunk/languages/lisp/types.pir (original)
+++ trunk/languages/lisp/types.pir Tue May 22 12:23:50 2007
@@ -88,7 +88,8 @@
.sub _get_args :method
.local pmc retv
- getattribute retv, self, "LispFunction\0args"
+ # VALID_IN_PARROT_0_2_0 getattribute retv, self, "LispFunction\0args"
+ getattribute retv, self, "args"
.return(retv)
.end
@@ -96,7 +97,8 @@
.sub _set_args :method
.param pmc args
- setattribute self, "LispFunction\0args", args
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispFunction\0args", args
+ setattribute self, "args", args
.return(args)
.end
@@ -112,7 +114,8 @@
.sub _set_body :method
.param pmc body
- setattribute self, "LispFunction\0body", body
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispFunction\0body", body
+ setattribute self, "body", body
.return(body)
.end
@@ -120,7 +123,8 @@
.sub _get_name :method
.local pmc retv
- getattribute retv, self, "LispFunction\0name"
+ # VALID_IN_PARROT_0_2_0 getattribute retv, self, "LispFunction\0name"
+ getattribute retv, self, "name"
.return(retv)
.end
@@ -128,7 +132,8 @@
.sub _set_name :method
.param pmc name
- setattribute self, "LispFunction\0name", name
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispFunction\0name", name
+ setattribute self, "name", name
.return(name)
.end
@@ -136,7 +141,8 @@
.sub _get_scope :method
.local pmc retv
- getattribute retv, self, "LispFunction\0scope"
+ # VALID_IN_PARROT_0_2_0 getattribute retv, self, "LispFunction\0scope"
+ getattribute retv, self, "scope"
.return(retv)
.end
@@ -144,7 +150,8 @@
.sub _set_scope :method
.param pmc scope
- setattribute self, "LispFunction\0scope", scope
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispFunction\0scope", scope
+ setattribute self, "scope", scope
.return(scope)
.end
@@ -207,10 +214,12 @@
.local pmc value
value = new Hash
- setattribute self, "LispPackage\0external", value
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispPackage\0external", value
+ setattribute self, "external", value
value = new Hash
- setattribute self, "LispPackage\0internal", value
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispPackage\0internal", value
+ setattribute self, "internal", value
.end
.sub _lookup_symbol :method
@@ -221,7 +230,8 @@
.local int depth
.local pmc hash
- getattribute hash, self, "LispPackage\0internal"
+ # VALID_IN_PARROT_0_2_0 getattribute hash, self, "LispPackage\0internal"
+ getattribute hash, self, "internal"
stack = hash[name]
typeof type, stack
@@ -251,7 +261,8 @@
symname = symbol._get_name_as_string()
- getattribute hash, self, "LispPackage\0internal"
+ # VALID_IN_PARROT_0_2_0 getattribute hash, self, "LispPackage\0internal"
+ getattribute hash, self, "internal"
stack = hash[symname]
@@ -278,7 +289,8 @@
.local pmc stack
.local pmc hash
- getattribute hash, self, "LispPackage\0internal"
+ # VALID_IN_PARROT_0_2_0 getattribute hash, self, "LispPackage\0internal"
+ getattribute hash, self, "internal"
stack = hash[name]
symbol = _SYMBOL(name)
@@ -296,7 +308,8 @@
.local pmc hash
.local int size
- getattribute hash, self, "LispPackage\0internal"
+ # VALID_IN_PARROT_0_2_0 getattribute hash, self, "LispPackage\0internal"
+ getattribute hash, self, "internal"
stack = hash[name]
size = stack
@@ -318,7 +331,8 @@
exports = new ResizablePMCArray
- getattribute hash, self, "LispPackage\0external"
+ # VALID_IN_PARROT_0_2_0 getattribute hash, self, "LispPackage\0external"
+ getattribute hash, self, "external"
iter i, hash
push_eh DONE
@@ -348,8 +362,10 @@
.local pmc stack
.local int top
- getattribute internal, self, "LispPackage\0internal"
- getattribute external, self, "LispPackage\0external"
+ # VALID_IN_PARROT_0_2_0 getattribute internal, self,
"LispPackage\0internal"
+ getattribute internal, self, "internal"
+ # VALID_IN_PARROT_0_2_0 getattribute external, self,
"LispPackage\0external"
+ getattribute external, self, "external"
stack = internal[name]
@@ -382,7 +398,8 @@
# the attribute internal has been set up in _init_types
.local pmc internal
- getattribute internal, self, "LispPackage\0internal"
+ # VALID_IN_PARROT_0_2_0 getattribute internal, self,
"LispPackage\0internal"
+ getattribute internal, self, "internal"
# stack for the name is not known to exist
.local pmc stack
@@ -412,7 +429,8 @@
.sub _get_name :method
.local pmc retv
- getattribute retv, self, "LispPackage\0name"
+ # VALID_IN_PARROT_0_2_0 getattribute retv, self, "LispPackage\0name"
+ getattribute retv, self, "name"
.return(retv)
.end
@@ -420,7 +438,8 @@
.sub _set_name :method
.param pmc name
- setattribute self, "LispPackage\0name", name
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispPackage\0name", name
+ setattribute self, "name", name
.return(name)
.end
@@ -429,7 +448,8 @@
.local pmc name
.local string retv
- getattribute name, self, "LispPackage\0name"
+ # VALID_IN_PARROT_0_2_0 getattribute name, self, "LispPackage\0name"
+ getattribute name, self, "name"
retv = name
.return(retv)
@@ -440,7 +460,8 @@
.local pmc tmps
.local pmc retv
- getattribute name, self, "LispPackage\0name"
+ # VALID_IN_PARROT_0_2_0 getattribute name, self, "LispPackage\0name"
+ getattribute name, self, "name"
retv = new String
tmps = new String
@@ -460,7 +481,8 @@
.sub _get_table :method
.local pmc retv
- getattribute retv, self, "LispReadtable\0table"
+ # VALID_IN_PARROT_0_2_0 getattribute retv, self, "LispReadtable\0table"
+ getattribute retv, self, "table"
.return(retv)
.end
@@ -468,7 +490,8 @@
.sub _set_table :method
.param pmc table
- setattribute self, "LispReadtable\0table", table
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispReadtable\0table", table
+ setattribute self, "table", table
.return(table)
.end
@@ -476,7 +499,8 @@
.sub _get_case :method
.local pmc retv
- getattribute retv, self, "LispReadtable\0case"
+ # VALID_IN_PARROT_0_2_0 getattribute retv, self, "LispReadtable\0case"
+ getattribute retv, self, "case"
.return(retv)
.end
@@ -484,7 +508,8 @@
.sub _set_case :method
.param pmc case
- setattribute self, "LispReadtable\0case", case
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispReadtable\0case", case
+ setattribute self, "case", case
.return(case)
.end
@@ -628,8 +653,10 @@
case = new Boolean
case = 0
- setattribute self, "LispReadtable\0table", table
- setattribute self, "LispReadtable\0case", case
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispReadtable\0table", table
+ setattribute self, "table", table
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispReadtable\0case", case
+ setattribute self, "case", case
.end
.sub __get_string :method
@@ -648,7 +675,8 @@
.sub _get_io :method
.local pmc retv
- getattribute retv, self, "LispStream\0stream"
+ # VALID_IN_PARROT_0_2_0 getattribute retv, self, "LispStream\0stream"
+ getattribute retv, self, "stream"
.return(retv)
.end
@@ -656,7 +684,8 @@
.sub _set_io :method
.param pmc io
- setattribute self, "LispStream\0stream", io
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispStream\0stream", io
+ setattribute self, "stream", io
.return(io)
.end
@@ -675,7 +704,8 @@
.sub _get_documentation :method
.local pmc retv
- getattribute retv, self, "LispSymbol\0documentation"
+ # VALID_IN_PARROT_0_2_0 getattribute retv, self, "LispSymbol\0documentation"
+ getattribute retv, self, "documentation"
.return(retv)
.end
@@ -683,7 +713,8 @@
.sub _set_documentation :method
.param pmc docs
- setattribute self, "LispSymbol\0documentation", docs
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispSymbol\0documentation", docs
+ setattribute self, "documentation", docs
.return(docs)
.end
@@ -691,7 +722,8 @@
.sub _get_function :method
.local pmc retv
- getattribute retv, self, "LispSymbol\0function"
+ # VALID_IN_PARROT_0_2_0 getattribute retv, self, "LispSymbol\0function"
+ getattribute retv, self, "function"
.return(retv)
.end
@@ -699,7 +731,8 @@
.sub _set_function :method
.param pmc function
- setattribute self, "LispSymbol\0function", function
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispSymbol\0function", function
+ setattribute self, "function", function
.return(function)
.end
@@ -707,7 +740,8 @@
.sub _get_name :method
.local pmc retv
- getattribute retv, self, "LispSymbol\0name"
+ # VALID_IN_PARROT_0_2_0 getattribute retv, self, "LispSymbol\0name"
+ getattribute retv, self, "name"
.return(retv)
.end
@@ -715,7 +749,8 @@
.sub _set_name :method
.param pmc name
- setattribute self, "LispSymbol\0name", name
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispSymbol\0name", name
+ setattribute self, "name", name
.return(name)
.end
@@ -724,7 +759,8 @@
.local pmc name
.local string retv
- getattribute name, self, "LispSymbol\0name"
+ # VALID_IN_PARROT_0_2_0 getattribute name, self, "LispSymbol\0name"
+ getattribute name, self, "name"
retv = name
.return(retv)
@@ -733,7 +769,8 @@
.sub _get_package :method
.local pmc retv
- getattribute retv, self, "LispSymbol\0package"
+ # VALID_IN_PARROT_0_2_0 getattribute retv, self, "LispSymbol\0package"
+ getattribute retv, self, "package"
.return(retv)
.end
@@ -741,7 +778,8 @@
.sub _set_package :method
.param pmc package
- setattribute self, "LispSymbol\0package", package
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispSymbol\0package", package
+ setattribute self, "package", package
.return(package)
.end
@@ -749,7 +787,8 @@
.sub _get_special :method
.local pmc retv
- getattribute retv, self, "LispSymbol\0special"
+ # VALID_IN_PARROT_0_2_0 getattribute retv, self, "LispSymbol\0special"
+ getattribute retv, self, "special"
.return(retv)
.end
@@ -757,7 +796,8 @@
.sub _set_special :method
.param pmc special
- setattribute self, "LispSymbol\0special", special
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispSymbol\0special", special
+ setattribute self, "special", special
.return(special)
.end
@@ -765,7 +805,8 @@
.sub _get_value :method
.local pmc retv
- getattribute retv, self, "LispSymbol\0value"
+ # VALID_IN_PARROT_0_2_0 getattribute retv, self, "LispSymbol\0value"
+ getattribute retv, self, "value"
.return(retv)
.end
@@ -773,7 +814,8 @@
.sub _set_value :method
.param pmc value
- setattribute self, "LispSymbol\0value", value
+ # VALID_IN_PARROT_0_2_0 setattribute self, "LispSymbol\0value", value
+ setattribute self, "value", value
.return(value)
.end
@@ -781,7 +823,8 @@
.sub __get_string :method
.local pmc name
- getattribute name, self, "LispSymbol\0name"
+ # VALID_IN_PARROT_0_2_0 getattribute name, self, "LispSymbol\0name"
+ getattribute name, self, "name"
.return(name)
.end
