Changeset 2664 for code/branches/buildsystem3/src/tolua/lua/feature.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/feature.lua (modified) (3 diffs)

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

@@ -40 +40 @@
 -- check if it requires collection
 function classFeature:requirecollection (t)
- return false
+    return false
 end
 
 -- build names
 function classFeature:buildnames ()
- if self.name and self.name~='' then
-  local n = split(self.name,'@')
-  self.name = n[1]
-  if not n[2] then
-   n[2] = applyrenaming(n[1])
-  end
-  self.lname = n[2] or gsub(n[1],"%[.-%]","")
-  self.original_name = self.name
-  self.lname = clean_template(self.lname)
- end
- if not self.is_parameter then
-         self.name = getonlynamespace() .. self.name
- end
+    if self.name and self.name~='' then
+        local n = split(self.name,'@')
+        self.name = n[1]
+        if not n[2] then
+            n[2] = applyrenaming(n[1])
+        end
+        self.lname = n[2] or gsub(n[1],"%[.-%]","")
+        self.original_name = self.name
+        self.lname = clean_template(self.lname)
+    end
+    if not self.is_parameter then
+        self.name = getonlynamespace() .. self.name
+    end
 
- local parent = classContainer.curr
- if parent then
-        self.access = parent.curr_member_access
- else
- end
+    local parent = classContainer.curr
+    if parent then
+        self.access = parent.curr_member_access
+    else
+    end
 end
 
 function classFeature:check_public_access()
 
-        if self.access and self.access ~= 0 then
-                return false
-        end
+    if self.access and self.access ~= 0 then
+        return false
+    end
 
-        local parent = classContainer.curr
-        while parent do
-                if parent.access and parent.access ~= 0 then
-                        return false
-                end
-                parent = parent.prox
-        end
-        return true
+    local parent = classContainer.curr
+    while parent do
+        if parent.access and parent.access ~= 0 then
+            return false
+        end
+        parent = parent.prox
+    end
+    return true
 end
 
 function clean_template(t)
 
-        return string.gsub(t, "[<>:, %*]", "_")
+    return string.gsub(t, "[<>:, %*]", "_")
 end
 
@@ -90 +90 @@
 -- it returns the container class name or nil.
 function classFeature:incontainer (which)
- if self.parent then
-  local parent = self.parent
-  while parent do
-   if parent.classtype == which then
-    return parent.name
-   end
-   parent = parent.parent
-  end
- end
- return nil
+    if self.parent then
+        local parent = self.parent
+        while parent do
+            if parent.classtype == which then
+                return parent.name
+            end
+            parent = parent.parent
+        end
+    end
+    return nil
 end
 
 function classFeature:inclass ()
- return self:incontainer('class')
+    return self:incontainer('class')
 end
 
 function classFeature:inmodule ()
- return self:incontainer('module')
+    return self:incontainer('module')
 end
 
 function classFeature:innamespace ()
- return self:incontainer('namespace')
+    return self:incontainer('namespace')
 end
 
@@ -118 +118 @@
 function classFeature:cfuncname (n)
 
- if self.parent then
-  n = self.parent:cfuncname(n)
- end
+    if self.parent then
+        n = self.parent:cfuncname(n)
+    end
 
-  n = string.gsub(n..'_'.. (self.lname or self.name), "[<>:, \.%*&]", "_")
+    n = string.gsub(n..'_'.. (self.lname or self.name), "[<>:, \.%*&]", "_")
 
-  return n
+    return n
 end