Changeset 2664 for code/branches/buildsystem3/src/tolua/lua/module.lua

Timestamp:

Feb 14, 2009, 10:53:45 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:

code/branches/buildsystem3

Files:

• . (modified) (2 props)
• src/tolua/lua/module.lua (modified) (3 diffs)

code/branches/buildsystem3/src/tolua/lua/module.lua

@@ -17 +17 @@
 --    {i} = list of objects in the module.
 classModule = {
- classtype = 'module'
+    classtype = 'module'
 }
 classModule.__index = classModule
@@ -24 +24 @@
 -- register module
 function classModule:register (pre)
- pre = pre or ''
- push(self)
- output(pre..'tolua_module(tolua_S,"'..self.name..'",',self:hasvar(),');')
- output(pre..'tolua_beginmodule(tolua_S,"'..self.name..'");')
- local i=1
- while self[i] do
-  self[i]:register(pre..' ')
-  i = i+1
- end
- output(pre..'tolua_endmodule(tolua_S);')
-        pop()
+    pre = pre or ''
+    push(self)
+    output(pre..'tolua_module(tolua_S,"'..self.name..'",',self:hasvar(),');')
+    output(pre..'tolua_beginmodule(tolua_S,"'..self.name..'");')
+    local i=1
+    while self[i] do
+        self[i]:register(pre..' ')
+        i = i+1
+    end
+    output(pre..'tolua_endmodule(tolua_S);')
+    pop()
 end
 
 -- Print method
 function classModule:print (ident,close)
- print(ident.."Module{")
- print(ident.." name = '"..self.name.."';")
- local i=1
- while self[i] do
-  self[i]:print(ident.." ",",")
-  i = i+1
- end
- print(ident.."}"..close)
+    print(ident.."Module{")
+    print(ident.." name = '"..self.name.."';")
+    local i=1
+    while self[i] do
+        self[i]:print(ident.." ",",")
+        i = i+1
+    end
+    print(ident.."}"..close)
 end
 
 -- Internal constructor
 function _Module (t)
- setmetatable(t,classModule)
- append(t)
- return t
+    setmetatable(t,classModule)
+    append(t)
+    return t
 end
 
@@ -59 +59 @@
 -- Expects two string representing the module name and body.
 function Module (n,b)
- local t = _Module(_Container{name=n})
- push(t)
- t:parse(strsub(b,2,strlen(b)-1)) -- eliminate braces
- pop()
- return t
+    local t = _Module(_Container{name=n})
+    push(t)
+    t:parse(strsub(b,2,strlen(b)-1)) -- eliminate braces
+    pop()
+    return t
 end