Changeset 3138 for code/branches/pch/src/tolua/lua/feature.lua

Timestamp:

Jun 10, 2009, 4:01:42 PM (15 years ago)

Author:

rgrieder

Message:

Tolua update to v1.0.93 is not working properly and I would not know how to fix it. I have created a patch however, just in case we need it after all.

File:

• code/branches/pch/src/tolua/lua/feature.lua (modified) (4 diffs)

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

@@ -48 +48 @@
         local n = split(self.name,'@')
         self.name = n[1]
-        self.name = string.gsub(self.name, ":%d*$", "")
         if not n[2] then
             n[2] = applyrenaming(n[1])
         end
         self.lname = n[2] or gsub(n[1],"%[.-%]","")
-        self.lname = string.gsub(self.lname, ":%d*$", "")
         self.original_name = self.name
         self.lname = clean_template(self.lname)
@@ -64 +62 @@
     if parent then
         self.access = parent.curr_member_access
-        self.global_access = self:check_public_access()
     else
     end
@@ -70 +67 @@
 
 function classFeature:check_public_access()
-
-    if type(self.global_access) == "boolean" then
-        return self.global_access
-    end
 
     if self.access and self.access ~= 0 then
@@ -129 +122 @@
     end
 
-    local fname = self.lname
-    if not fname or fname == '' then
-        fname = self.name
-    end
-    n = string.gsub(n..'_'.. (fname), "[<>:, \.%*&]", "_")
+    n = string.gsub(n..'_'.. (self.lname or self.name), "[<>:, \.%*&]", "_")
 
     return n