Author: fperrad
Date: Fri Nov 7 08:04:14 2008
New Revision: 32426
Modified:
trunk/languages/lua/lua.pir
trunk/languages/lua/src/POSTGrammar.tg
trunk/languages/lua/src/lib/_helpers.pir
trunk/languages/lua/src/lib/alarm.pir
trunk/languages/lua/src/lib/base64.pir
trunk/languages/lua/src/lib/bc.pir
trunk/languages/lua/src/lib/bitlib.pir
trunk/languages/lua/src/lib/gl_binding.pir
trunk/languages/lua/src/lib/glut.pir
trunk/languages/lua/src/lib/lfs.pir
trunk/languages/lua/src/lib/lpeg.pir
trunk/languages/lua/src/lib/luaaux.pir
trunk/languages/lua/src/lib/luabasic.pir
trunk/languages/lua/src/lib/luabytecode.pir
trunk/languages/lua/src/lib/luabytecode.rules
trunk/languages/lua/src/lib/luacoroutine.pir
trunk/languages/lua/src/lib/luaio.pir
trunk/languages/lua/src/lib/luapackage.pir
trunk/languages/lua/src/lib/luastring.pir
trunk/languages/lua/src/lib/markdown.pir
trunk/languages/lua/src/lib/md5.pir
trunk/languages/lua/src/lib/random.pir
trunk/languages/lua/src/lib/struct.pir
trunk/languages/lua/src/lib/uuid.pir
trunk/languages/lua/src/yapp/Lua/pir.pm
trunk/languages/lua/t/package.t
Log:
[Lua]
- fix compilers & libs, new syntax .const 'Name'
(see r32419)
Modified: trunk/languages/lua/lua.pir
==============================================================================
--- trunk/languages/lua/lua.pir (original)
+++ trunk/languages/lua/lua.pir Fri Nov 7 08:04:14 2008
@@ -274,7 +274,7 @@
(narg, $P0) = getargs(args, n) # collect arguments
.local pmc env
env = get_hll_global '_G'
- .const .LuaString k_arg = 'arg'
+ .const 'LuaString' k_arg = 'arg'
env.'rawset'(k_arg, $P0)
.local string fname
fname = args[n]
@@ -361,7 +361,7 @@
.param string name
.local pmc env
env = get_hll_global '_G'
- .const .LuaString k_require = 'require'
+ .const 'LuaString' k_require = 'require'
$P0 = env.'rawget'(k_require)
new $P1, 'LuaString'
set $P1, name
@@ -373,7 +373,7 @@
.sub 'dotty' :anon
.local pmc env
env = get_hll_global '_G'
- .const .LuaString k_print = 'print'
+ .const 'LuaString' k_print = 'print'
.local int has_readline
.local pmc stdin
stdin = getstdin
Modified: trunk/languages/lua/src/POSTGrammar.tg
==============================================================================
--- trunk/languages/lua/src/POSTGrammar.tg (original)
+++ trunk/languages/lua/src/POSTGrammar.tg Fri Nov 7 08:04:14 2008
@@ -76,7 +76,7 @@
ops = $P0.'new'('node'=>node)
ops.'push'(post)
$S0 = post.'unique'('fct_')
- ops.'push_pirop'('inline', $S0, esc_name, 'inline'=>' .const .Sub %0 =
%1')
+ ops.'push_pirop'('inline', $S0, esc_name, 'inline'=>' .const "Sub" %0 =
%1')
.local string result
result = ops.'unique'('$P')
ops.'push_pirop'('newclosure', result, $S0)
@@ -98,7 +98,7 @@
env = get_hll_global "_G"
.local pmc vararg
vararg = argstolua(env, args)
- .const .Sub main = %0
+ .const "Sub" main = %0
main."setfenv"(env)
($I0, $P0) = docall(main, vararg :flat)
unless $I0 goto L1
@@ -819,7 +819,7 @@
ops_const = subpost.'ops_const'()
$S0 = 'k_' . name
$S1 = ops_const.'escape'(name)
- $P0 = ops_const.'push_pirop'('inline', $S0, $S1, 'inline'=>' .const
.LuaString %0 = %1')
+ $P0 = ops_const.'push_pirop'('inline', $S0, $S1, 'inline'=>' .const
"LuaString" %0 = %1')
storage_const[name] = $S0
L1:
.local pmc ops
@@ -1023,7 +1023,7 @@
ops_const = subpost.'ops_const'()
$S0 = 'k_' . name
$S1 = ops_const.'escape'(name)
- $P0 = ops_const.'push_pirop'('inline', $S0, $S1, 'inline'=>' .const
.LuaString %0 = %1')
+ $P0 = ops_const.'push_pirop'('inline', $S0, $S1, 'inline'=>' .const
"LuaString" %0 = %1')
storage_const[name] = $S0
L5:
$P0 = get_hll_global ['POST'], 'Ops'
Modified: trunk/languages/lua/src/lib/_helpers.pir
==============================================================================
--- trunk/languages/lua/src/lib/_helpers.pir (original)
+++ trunk/languages/lua/src/lib/_helpers.pir Fri Nov 7 08:04:14 2008
@@ -18,7 +18,7 @@
.sub '__onload' :anon :load
# print "__onload _helpers\n"
- .const .Sub entry = 'luaopen__helpers'
+ .const 'Sub' entry = 'luaopen__helpers'
set_hll_global 'luaopen__helpers', entry
.end
Modified: trunk/languages/lua/src/lib/alarm.pir
==============================================================================
--- trunk/languages/lua/src/lib/alarm.pir (original)
+++ trunk/languages/lua/src/lib/alarm.pir Fri Nov 7 08:04:14 2008
@@ -22,7 +22,7 @@
.sub '__onload' :anon :load
# print "__onload alarm\n"
- .const .Sub entry = 'luaopen_alarm'
+ .const 'Sub' entry = 'luaopen_alarm'
set_hll_global 'luaopen_alarm', entry
.end
@@ -35,7 +35,7 @@
new $P1, 'LuaString'
- .const .Sub _alarm = 'alarm'
+ .const 'Sub' _alarm = 'alarm'
_alarm.'setfenv'(_lua__GLOBAL)
set $P1, 'alarm'
_lua__GLOBAL[$P1] = _alarm
Modified: trunk/languages/lua/src/lib/base64.pir
==============================================================================
--- trunk/languages/lua/src/lib/base64.pir (original)
+++ trunk/languages/lua/src/lib/base64.pir Fri Nov 7 08:04:14 2008
@@ -22,7 +22,7 @@
.sub '__onload' :anon :load
# print "__onload base64\n"
- .const .Sub entry = 'luaopen_base64'
+ .const 'Sub' entry = 'luaopen_base64'
set_hll_global 'luaopen_base64', entry
.end
Modified: trunk/languages/lua/src/lib/bc.pir
==============================================================================
--- trunk/languages/lua/src/lib/bc.pir (original)
+++ trunk/languages/lua/src/lib/bc.pir Fri Nov 7 08:04:14 2008
@@ -25,7 +25,7 @@
.sub '__onload' :anon :load
# print "__onload bc\n"
- .const .Sub entry = 'luaopen_bc'
+ .const 'Sub' entry = 'luaopen_bc'
set_hll_global 'luaopen_bc', entry
.end
Modified: trunk/languages/lua/src/lib/bitlib.pir
==============================================================================
--- trunk/languages/lua/src/lib/bitlib.pir (original)
+++ trunk/languages/lua/src/lib/bitlib.pir Fri Nov 7 08:04:14 2008
@@ -25,7 +25,7 @@
.sub '__onload' :anon :load
# print "__onload bitlib\n"
- .const .Sub entry = 'luaopen_bitlib'
+ .const 'Sub' entry = 'luaopen_bitlib'
set_hll_global 'luaopen_bitlib', entry
.end
Modified: trunk/languages/lua/src/lib/gl_binding.pir
==============================================================================
--- trunk/languages/lua/src/lib/gl_binding.pir (original)
+++ trunk/languages/lua/src/lib/gl_binding.pir Fri Nov 7 08:04:14 2008
@@ -21,7 +21,7 @@
.sub '__onload' :anon :load
# print '__onload gl_binding\n'
- .const .Sub entry = 'luaopen_gl_binding'
+ .const 'Sub' entry = 'luaopen_gl_binding'
set_hll_global 'luaopen_gl_binding', entry
.end
Modified: trunk/languages/lua/src/lib/glut.pir
==============================================================================
--- trunk/languages/lua/src/lib/glut.pir (original)
+++ trunk/languages/lua/src/lib/glut.pir Fri Nov 7 08:04:14 2008
@@ -23,7 +23,7 @@
.sub '__onload' :anon :load
# print "__onload glut\n"
- .const .Sub entry = 'luaopen_glut'
+ .const 'Sub' entry = 'luaopen_glut'
set_hll_global 'luaopen_glut', entry
.end
@@ -117,7 +117,7 @@
lua_error("incorrect argument to function 'glut.DisplayFunc'")
L1:
set_hll_global 'displayFunc.name', funcname
- .const .Sub display = 'display'
+ .const 'Sub' display = 'display'
glutDisplayFunc(display)
.end
@@ -159,7 +159,7 @@
lua_error("incorrect argument to function 'glut.IdleFunc'")
L1:
set_hll_global 'idleFunc.name', funcname
- .const .Sub idle = 'idle'
+ .const 'Sub' idle = 'idle'
glutIdleFunc(idle)
.end
@@ -197,7 +197,7 @@
.param pmc extra :slurpy
.local pmc argv
new argv, 'ResizableStringArray'
- .const .Sub glutInit = 'glutInit'
+ .const 'Sub' glutInit = 'glutInit'
$P0 = get_hll_global ['NCI'], 'call_toolkit_init'
$P0(glutInit, argv)
.end
@@ -248,7 +248,7 @@
lua_error("incorrect argument to function 'glut.KeyboardFunc'")
L1:
set_hll_global 'keyboardFunc.name', funcname
- .const .Sub keyboard = 'keyboard'
+ .const 'Sub' keyboard = 'keyboard'
glutKeyboardFunc(keyboard)
.end
@@ -319,7 +319,7 @@
lua_error("incorrect argument to function 'glut.ReshapeFunc'")
L1:
set_hll_global 'reshapeFunc.name', funcname
- .const .Sub reshape = 'reshape'
+ .const 'Sub' reshape = 'reshape'
glutReshapeFunc(reshape)
.end
Modified: trunk/languages/lua/src/lib/lfs.pir
==============================================================================
--- trunk/languages/lua/src/lib/lfs.pir (original)
+++ trunk/languages/lua/src/lib/lfs.pir Fri Nov 7 08:04:14 2008
@@ -26,7 +26,7 @@
.sub '__onload' :anon :load
# print "__onload lfs\n"
- .const .Sub entry = 'luaopen_lfs'
+ .const 'Sub' entry = 'luaopen_lfs'
set_hll_global 'luaopen_lfs', entry
.end
@@ -167,31 +167,31 @@
$S1 = lua_checkstring(1, .filepath)
$S0 = $S1
new members, 'Hash'
- .const .Sub st_mode = 'st_mode'
+ .const 'Sub' st_mode = 'st_mode'
members['mode'] = st_mode
- .const .Sub st_dev = 'st_dev'
+ .const 'Sub' st_dev = 'st_dev'
members['dev'] = st_dev
- .const .Sub st_ino = 'st_ino'
+ .const 'Sub' st_ino = 'st_ino'
members['ino'] = st_ino
- .const .Sub st_nlink = 'st_nlink'
+ .const 'Sub' st_nlink = 'st_nlink'
members['nlink'] = st_nlink
- .const .Sub st_uid = 'st_uid'
+ .const 'Sub' st_uid = 'st_uid'
members['uid'] = st_uid
- .const .Sub st_gid = 'st_gid'
+ .const 'Sub' st_gid = 'st_gid'
members['gid'] = st_gid
- .const .Sub st_rdev = 'st_rdev'
+ .const 'Sub' st_rdev = 'st_rdev'
members['rdev'] = st_rdev
- .const .Sub st_atime = 'st_atime'
+ .const 'Sub' st_atime = 'st_atime'
members['access'] = st_atime
- .const .Sub st_mtime = 'st_mtime'
+ .const 'Sub' st_mtime = 'st_mtime'
members['modification'] = st_mtime
- .const .Sub st_ctime = 'st_ctime'
+ .const 'Sub' st_ctime = 'st_ctime'
members['change'] = st_ctime
- .const .Sub st_size = 'st_size'
+ .const 'Sub' st_size = 'st_size'
members['size'] = st_size
- .const .Sub st_blocks = 'st_blocks'
+ .const 'Sub' st_blocks = 'st_blocks'
members['blocks'] = st_blocks
- .const .Sub st_blksize = 'st_blksize'
+ .const 'Sub' st_blksize = 'st_blksize'
members['blksize'] = st_blksize
new $P0, 'OS'
push_eh _handler
@@ -489,7 +489,7 @@
$P1 = $P0.'readdir'($S1)
pop_eh
.lex 'upvar_dir', $P1
- .const .Sub dir_aux = 'dir_aux'
+ .const 'Sub' dir_aux = 'dir_aux'
res = newclosure dir_aux
.return (res)
_handler:
Modified: trunk/languages/lua/src/lib/lpeg.pir
==============================================================================
--- trunk/languages/lua/src/lib/lpeg.pir (original)
+++ trunk/languages/lua/src/lib/lpeg.pir Fri Nov 7 08:04:14 2008
@@ -24,7 +24,7 @@
.sub '__onload' :anon :load
# print "__onload lpeg\n"
- .const .Sub entry = 'luaopen_lpeg'
+ .const 'Sub' entry = 'luaopen_lpeg'
set_hll_global 'luaopen_lpeg', entry
.end
Modified: trunk/languages/lua/src/lib/luaaux.pir
==============================================================================
--- trunk/languages/lua/src/lib/luaaux.pir (original)
+++ trunk/languages/lua/src/lib/luaaux.pir Fri Nov 7 08:04:14 2008
@@ -793,7 +793,7 @@
.param pmc names
.param pmc env :optional
if null libname goto L1
- .const .LuaString _loaded = '_LOADED'
+ .const 'LuaString' _loaded = '_LOADED'
.local pmc _lua__REGISTRY
_lua__REGISTRY = get_hll_global '_REGISTRY'
$P0 = _lua__REGISTRY[_loaded]
@@ -903,7 +903,7 @@
inc i
goto L4
L5:
- .const .LuaString k_arg = 'arg'
+ .const 'LuaString' k_arg = 'arg'
env.'rawset'(k_arg, $P0)
L3:
.return (res)
Modified: trunk/languages/lua/src/lib/luabasic.pir
==============================================================================
--- trunk/languages/lua/src/lib/luabasic.pir (original)
+++ trunk/languages/lua/src/lib/luabasic.pir Fri Nov 7 08:04:14 2008
@@ -252,7 +252,7 @@
.param pmc extra :slurpy
.local pmc res
if null f goto L1
- .const .LuaNumber zero = '0'
+ .const 'LuaNumber' zero = '0'
if f == zero goto L2
L1:
f = getfunc(f, 1)
@@ -313,7 +313,7 @@
.return (res)
L1:
.local pmc prot
- .const .LuaString mt = '__metatable'
+ .const 'LuaString' mt = '__metatable'
prot = res.'rawget'(mt)
unless prot goto L2
.return (prot)
@@ -344,7 +344,7 @@
unless null i goto L1
.local pmc _G
_G = get_hll_global '_G'
- .const .LuaString key_ipairs = 'ipairs'
+ .const 'LuaString' key_ipairs = 'ipairs'
.local pmc ipairs
ipairs = _G.'rawget'(key_ipairs)
.local pmc zero
@@ -497,7 +497,7 @@
lua_checktype(1, t, 'table')
.local pmc _G
_G = get_hll_global '_G'
- .const .LuaString key_next = 'next'
+ .const 'LuaString' key_next = 'next'
.local pmc next
next = _G.'rawget'(key_next)
.local pmc nil
@@ -704,7 +704,7 @@
.param pmc f :optional
.param pmc table :optional
.param pmc extra :slurpy
- .const .LuaNumber zero = '0'
+ .const 'LuaNumber' zero = '0'
lua_checktype(2, table, 'table')
unless f == zero goto L1
# change environment of current thread
@@ -750,7 +750,7 @@
meta = table.'get_metatable'()
unless meta goto L3
.local pmc prot
- .const .LuaString mt = '__metatable'
+ .const 'LuaString' mt = '__metatable'
prot = meta.'rawget'(mt)
unless prot goto L3
lua_error("cannot change a protected metatable")
Modified: trunk/languages/lua/src/lib/luabytecode.pir
==============================================================================
--- trunk/languages/lua/src/lib/luabytecode.pir (original)
+++ trunk/languages/lua/src/lib/luabytecode.pir Fri Nov 7 08:04:14 2008
@@ -79,7 +79,7 @@
env = get_hll_global '_G'
.local pmc vararg
vararg = argstolua(env, args)
- .const .Sub main = '&function_0'
+ .const 'Sub' main = '&function_0'
main.'setfenv'(env)
($I0, $P0) = docall(main, vararg :flat)
unless $I0 goto L1
Modified: trunk/languages/lua/src/lib/luabytecode.rules
==============================================================================
--- trunk/languages/lua/src/lib/luabytecode.rules (original)
+++ trunk/languages/lua/src/lib/luabytecode.rules Fri Nov 7 08:04:14 2008
@@ -1042,7 +1042,7 @@
format => 'ABx',
synopsis => 'R(A) := closure(KPROTO[Bx], R(A), ... , R(A+n))',
pir => <<'PIR',
- ${INS} = concat " .const .Sub ${PROTO}"
+ ${INS} = concat " .const 'Sub' ${PROTO}"
$S2 = ${B}
${INS} = concat $S2
${INS} = concat " = '"
Modified: trunk/languages/lua/src/lib/luacoroutine.pir
==============================================================================
--- trunk/languages/lua/src/lib/luacoroutine.pir (original)
+++ trunk/languages/lua/src/lib/luacoroutine.pir Fri Nov 7 08:04:14 2008
@@ -220,7 +220,7 @@
.local pmc co
.lex 'upvar_co', co
co = create(f)
- .const .Sub auxwrap = 'auxwrap'
+ .const 'Sub' auxwrap = 'auxwrap'
res = newclosure auxwrap
.return (res)
.end
Modified: trunk/languages/lua/src/lib/luaio.pir
==============================================================================
--- trunk/languages/lua/src/lib/luaio.pir (original)
+++ trunk/languages/lua/src/lib/luaio.pir Fri Nov 7 08:04:14 2008
@@ -41,7 +41,7 @@
# create (private) environment (with fields IO_INPUT, IO_OUTPUT, __close)
.local pmc _io_env
- .const .Sub _io_fclose = 'fclose'
+ .const 'Sub' _io_fclose = 'fclose'
_io_env = newfenv(_io_fclose)
.local pmc _lua__GLOBAL
@@ -69,7 +69,7 @@
LIST
lua_register($P1, _io, $P2, _io_env)
- .const .Sub _readline = 'readline'
+ .const 'Sub' _readline = 'readline'
_readline.'setfenv'(_io_env)
$P0 = get_hll_namespace ['io'; 'file']
@@ -90,7 +90,7 @@
.param pmc fct
.local pmc env
new env, 'LuaTable'
- .const .LuaString key = '__close'
+ .const 'LuaString' key = '__close'
env[key] = fct
.return (env)
.end
@@ -105,7 +105,7 @@
.param pmc io
.param pmc io_env
.local pmc env
- .const .Sub _io_noclose = 'noclose'
+ .const 'Sub' _io_noclose = 'noclose'
env = newfenv(_io_noclose) # close function for default files
new $P1, 'LuaString'
new $P3, 'LuaNumber'
@@ -308,7 +308,7 @@
mt = file.'get_metatable'()
.local pmc _lua__REGISTRY
_lua__REGISTRY = get_hll_global '_REGISTRY'
- .const .LuaString key = 'ParrotIO'
+ .const 'LuaString' key = 'ParrotIO'
mt_file = _lua__REGISTRY[key]
unless mt == mt_file goto L1
res = getattribute file, 'data'
@@ -331,7 +331,7 @@
.param pmc file
.local pmc env
env = file.'getfenv'()
- .const .LuaString key = '__close'
+ .const 'LuaString' key = '__close'
$P0 = env[key]
.return $P0(file)
.end
@@ -342,7 +342,7 @@
.local pmc res
.lex 'upvar_file', file
.lex 'upvar_toclose', toclose
- .const .Sub readline = 'readline'
+ .const 'Sub' readline = 'readline'
res = newclosure readline
.return (res)
.end
@@ -393,7 +393,7 @@
.sub 'flush'
.param pmc extra :slurpy
.local pmc file
- .const .LuaString key = 'flush'
+ .const 'LuaString' key = 'flush'
file = getiofile(IO_OUTPUT)
$P0 = file[key]
.return $P0(file)
@@ -463,7 +463,7 @@
.local pmc file
.local pmc f
unless null filename goto L1
- .const .LuaString key = 'lines'
+ .const 'LuaString' key = 'lines'
file = getiofile(IO_INPUT)
$P0 = file[key]
.return $P0(file)
@@ -623,7 +623,7 @@
.sub 'read'
.param pmc argv :slurpy
.local pmc file
- .const .LuaString key = 'read'
+ .const 'LuaString' key = 'read'
file = getiofile(IO_INPUT)
$P0 = file[key]
.return $P0(file, argv :flat)
@@ -680,7 +680,7 @@
mt = obj.'get_metatable'()
.local pmc _lua__REGISTRY
_lua__REGISTRY = get_hll_global '_REGISTRY'
- .const .LuaString key = 'ParrotIO'
+ .const 'LuaString' key = 'ParrotIO'
mt_file = _lua__REGISTRY[key]
if mt == mt_file goto L1
new res, 'LuaNil'
@@ -707,7 +707,7 @@
.sub 'write'
.param pmc argv :slurpy
.local pmc file
- .const .LuaString key = 'write'
+ .const 'LuaString' key = 'write'
file = getiofile(IO_OUTPUT)
$P0 = file[key]
.return $P0(file, argv :flat)
Modified: trunk/languages/lua/src/lib/luapackage.pir
==============================================================================
--- trunk/languages/lua/src/lib/luapackage.pir (original)
+++ trunk/languages/lua/src/lib/luapackage.pir Fri Nov 7 08:04:14 2008
@@ -49,19 +49,19 @@
_package[$P1] = _loaders
new $P2, 'LuaNumber'
- .const .Sub loader_preload = 'loader_preload'
+ .const 'Sub' loader_preload = 'loader_preload'
set $P2, 1
_loaders[$P2] = loader_preload
- .const .Sub loader_Lua = 'loader_Lua'
+ .const 'Sub' loader_Lua = 'loader_Lua'
inc $P2
_loaders[$P2] = loader_Lua
- .const .Sub loader_PBC = 'loader_PBC'
+ .const 'Sub' loader_PBC = 'loader_PBC'
inc $P2
_loaders[$P2] = loader_PBC
- .const .Sub loader_PBCroot = 'loader_PBCroot'
+ .const 'Sub' loader_PBCroot = 'loader_PBCroot'
inc $P2
_loaders[$P2] = loader_PBCroot
Modified: trunk/languages/lua/src/lib/luastring.pir
==============================================================================
--- trunk/languages/lua/src/lib/luastring.pir (original)
+++ trunk/languages/lua/src/lib/luastring.pir Fri Nov 7 08:04:14 2008
@@ -607,7 +607,7 @@
.lex 'upvar_rulesub', rulesub
$P0 = clone s
.lex 'upvar_s', $P0
- .const .Sub gmatch_aux = 'gmatch_aux'
+ .const 'Sub' gmatch_aux = 'gmatch_aux'
res = newclosure gmatch_aux
.return (res)
.end
Modified: trunk/languages/lua/src/lib/markdown.pir
==============================================================================
--- trunk/languages/lua/src/lib/markdown.pir (original)
+++ trunk/languages/lua/src/lib/markdown.pir Fri Nov 7 08:04:14 2008
@@ -22,7 +22,7 @@
.sub '__onload' :anon :load
# print "__onload markdown\n"
- .const .Sub entry = 'luaopen_markdown'
+ .const 'Sub' entry = 'luaopen_markdown'
set_hll_global 'luaopen_markdown', entry
.end
Modified: trunk/languages/lua/src/lib/md5.pir
==============================================================================
--- trunk/languages/lua/src/lib/md5.pir (original)
+++ trunk/languages/lua/src/lib/md5.pir Fri Nov 7 08:04:14 2008
@@ -23,7 +23,7 @@
.sub '__onload' :anon :load
# print "__onload md5\n"
- .const .Sub entry = 'luaopen_md5'
+ .const 'Sub' entry = 'luaopen_md5'
set_hll_global 'luaopen_md5', entry
.end
Modified: trunk/languages/lua/src/lib/random.pir
==============================================================================
--- trunk/languages/lua/src/lib/random.pir (original)
+++ trunk/languages/lua/src/lib/random.pir Fri Nov 7 08:04:14 2008
@@ -23,7 +23,7 @@
.sub '__onload' :anon :load
# print "__onload random\n"
- .const .Sub entry = 'luaopen_random'
+ .const 'Sub' entry = 'luaopen_random'
set_hll_global 'luaopen_random', entry
.end
Modified: trunk/languages/lua/src/lib/struct.pir
==============================================================================
--- trunk/languages/lua/src/lib/struct.pir (original)
+++ trunk/languages/lua/src/lib/struct.pir Fri Nov 7 08:04:14 2008
@@ -110,7 +110,7 @@
.sub '__onload' :anon :load
# print "__onload struct\n"
- .const .Sub entry = 'luaopen_struct'
+ .const 'Sub' entry = 'luaopen_struct'
set_hll_global 'luaopen_struct', entry
.end
Modified: trunk/languages/lua/src/lib/uuid.pir
==============================================================================
--- trunk/languages/lua/src/lib/uuid.pir (original)
+++ trunk/languages/lua/src/lib/uuid.pir Fri Nov 7 08:04:14 2008
@@ -22,7 +22,7 @@
.sub '__onload' :anon :load
# print "__onload uuid\n"
- .const .Sub entry = 'luaopen_uuid'
+ .const 'Sub' entry = 'luaopen_uuid'
set_hll_global 'luaopen_uuid', entry
.end
@@ -49,7 +49,7 @@
lua_register($P1, _uuid, $P2)
# ???
- .const .Sub _uuid_time = 'time'
+ .const 'Sub' _uuid_time = 'time'
_uuid_time.'setfenv'(_lua__GLOBAL)
set $P1, 'time'
_uuid[$P1] = _uuid_time
Modified: trunk/languages/lua/src/yapp/Lua/pir.pm
==============================================================================
--- trunk/languages/lua/src/yapp/Lua/pir.pm (original)
+++ trunk/languages/lua/src/yapp/Lua/pir.pm Fri Nov 7 08:04:14 2008
@@ -41,7 +41,7 @@
env = get_hll_global '_G'
.local pmc vararg
vararg = argstolua(env, args)
- .const .Sub main = '_main'
+ .const 'Sub' main = '_main'
main.'setfenv'(env)
($I0, $P0) = docall(main, vararg :flat)
unless $I0 goto L1
@@ -408,7 +408,7 @@
my $self = shift;
my ($dir) = @_;
my $FH = $self->{fh};
- print {$FH} " .const .$dir->{type} $dir->{result}->{symbol} =
'$dir->{arg1}'\n";
+ print {$FH} " .const '$dir->{type}' $dir->{result}->{symbol} =
'$dir->{arg1}'\n";
return;
}
Modified: trunk/languages/lua/t/package.t
==============================================================================
--- trunk/languages/lua/t/package.t (original)
+++ trunk/languages/lua/t/package.t Fri Nov 7 08:04:14 2008
@@ -209,7 +209,7 @@
.sub '__onload' :anon :load
# print "__onload mod_foo\n"
- .const .Sub entry = 'luaopen_mod_foo'
+ .const 'Sub' entry = 'luaopen_mod_foo'
set_root_global 'luaopen_mod_foo', entry
.end
@@ -222,7 +222,7 @@
new _mod_foo, 'LuaTable'
set $P1, 'mod_foo'
_lua__GLOBAL[$P1] = _mod_foo
- .const .Sub _mod_foo_bar = '_mod_foo_bar'
+ .const 'Sub' _mod_foo_bar = '_mod_foo_bar'
set $P1, 'bar'
_mod_foo[$P1] = _mod_foo_bar
.return (_mod_foo)
