Changeset 2229 for code/branches/buildsystem/src/tolua/lua/clean.lua

Timestamp:

Nov 19, 2008, 4:40:43 PM (15 years ago)

Author:

rgrieder

Message:

Cleaned up indentation chaos in tolua. There were tabs and 1 space indentations, even mixed in a single block.
It should now be possible to actually pimp these files.

File:

• code/branches/buildsystem/src/tolua/lua/clean.lua (modified) (1 diff)

code/branches/buildsystem/src/tolua/lua/clean.lua

@@ -10 +10 @@
 
 MASK = { -- the substitution order is important
- {ESC1, "\\'"},
- {ESC2, '\\"'},
- {STR1, "'"},
- {STR2, '"'},
- {STR3, "%[%["},
- {STR4, "%]%]"},
- {REM , "%-%-"},
+    {ESC1, "\\'"},
+    {ESC2, '\\"'},
+    {STR1, "'"},
+    {STR2, '"'},
+    {STR3, "%[%["},
+    {STR4, "%]%]"},
+    {REM , "%-%-"},
 }
 
 function mask (s)
- for i = 1,getn(MASK)  do
-  s = gsub(s,MASK[i][2],MASK[i][1])
- end
- return s
+    for i = 1,getn(MASK)  do
+        s = gsub(s,MASK[i][2],MASK[i][1])
+    end
+    return s
 end
 
 function unmask (s)
- for i = 1,getn(MASK)  do
-  s = gsub(s,MASK[i][1],MASK[i][2])
- end
- return s
+    for i = 1,getn(MASK)  do
+        s = gsub(s,MASK[i][1],MASK[i][2])
+    end
+    return s
 end
 
 function clean (s)
- -- check for compilation error
- local code = "return function ()\n" .. s .. "\n end"
- if not dostring(code) then
-  return nil
- end
+    -- check for compilation error
+    local code = "return function ()\n" .. s .. "\n end"
+    if not dostring(code) then
+        return nil
+    end
 
- if flags['C'] then
-        return s
- end
+    if flags['C'] then
+        return s
+    end
 
- local S = "" -- saved string
+    local S = "" -- saved string
 
- s = mask(s)
+    s = mask(s)
 
- -- remove blanks and comments
- while 1 do
-  local b,e,d = strfind(s,ANY)
-  if b then
-   S = S..strsub(s,1,b-1)
-   s = strsub(s,b+1)
-   if d==STR1 or d==STR2 then
-    e = strfind(s,d)
-    S = S ..d..strsub(s,1,e)
-    s = strsub(s,e+1)
-   elseif d==STR3 then
-    e = strfind(s,STR4)
-    S = S..d..strsub(s,1,e)
-    s = strsub(s,e+1)
-   elseif d==REM then
-    s = gsub(s,"[^\n]*(\n?)","%1",1)
-   end
-  else
-   S = S..s
-   break
-  end
- end
- -- eliminate unecessary spaces
- S = gsub(S,"[ \t]+"," ")
- S = gsub(S,"[ \t]*\n[ \t]*","\n")
-        S = gsub(S,"\n+","\n")
- S = unmask(S)
- return S
+    -- remove blanks and comments
+    while 1 do
+        local b,e,d = strfind(s,ANY)
+        if b then
+            S = S..strsub(s,1,b-1)
+            s = strsub(s,b+1)
+            if d==STR1 or d==STR2 then
+                e = strfind(s,d)
+                S = S ..d..strsub(s,1,e)
+                s = strsub(s,e+1)
+            elseif d==STR3 then
+                e = strfind(s,STR4)
+                S = S..d..strsub(s,1,e)
+                s = strsub(s,e+1)
+            elseif d==REM then
+                s = gsub(s,"[^\n]*(\n?)","%1",1)
+            end
+        else
+            S = S..s
+            break
+        end
+    end
+    -- eliminate unecessary spaces
+    S = gsub(S,"[ \t]+"," ")
+    S = gsub(S,"[ \t]*\n[ \t]*","\n")
+    S = gsub(S,"\n+","\n")
+    S = unmask(S)
+    return S
 end