Started to remove extraneous spaces

2 files changed, 1121 insertions, 90 deletions

diff --git a/test/glum_test.lua b/test/glum_test.lua
index 9f538ad..e9447dd 100644
--- a/test/glum_test.lua
+++ b/test/glum_test.lua
@@ -1,150 +1,888 @@
 --local glum = dofile("../src/test.lua")
 local glum = dofile("../src/glum.lua")
+local ugly = dofile("../src/uglify.lua")
 
 local f5 = io.open("../src/glum.lua", "r")
 local str5 = f5:read("*a")
 f5:close()
 
-local str = [[
+local str = [==[
+--[[
+This module implements a parser for Lua 5.2 with LPeg,
+and generates an Abstract Syntax Tree in the Metalua format.
+For more information about Metalua, please, visit:
+https://github.com/fab13n/metalua-parser
+
+block: { stat* }
+
+stat:
+  `Do{ stat* }
+  | `Set{ {lhs+} {expr+} }                    -- lhs1, lhs2... = e1, e2...
+  | `While{ expr block }                      -- while e do b end
+  | `Repeat{ block expr }                     -- repeat b until e
+  | `If{ (expr block)+ block? }               -- if e1 then b1 [elseif e2 then b2] ... [else bn] end
+  | `Fornum{ ident expr expr expr? block }    -- for ident = e, e[, e] do b end
+  | `Forin{ {ident+} {expr+} block }          -- for i1, i2... in e1, e2... do b end
+  | `Local{ {ident+} {expr+}? }               -- local i1, i2... = e1, e2...
+  | `Localrec{ ident expr }                   -- only used for 'local function'
+  | `Goto{ <string> }                         -- goto str
+  | `Label{ <string> }                        -- ::str::
+  | `Return{ <expr*> }                        -- return e1, e2...
+  | `Break                                    -- break
+  | apply
+
+expr:
+  `Nil
+  | `Dots
+  | `True
+  | `False
+  | `Number{ <number> }
+  | `String{ <string> }
+  | `Function{ { `Id{ <string> }* `Dots? } block }
+  | `Table{ ( `Pair{ expr expr } | expr )* }
+  | `Op{ opid expr expr? }
+  | `Paren{ expr }       -- significant to cut multiple values returns
+  | apply
+  | lhs
+
+apply:
+  `Call{ expr expr* }
+  | `Invoke{ expr `String{ <string> } expr* }
+
+lhs: `Id{ <string> } | `Index{ expr expr }
+
+opid: 'add' | 'sub' | 'mul' | 'div' | 'idiv' | 'mod' | 'pow' | 'concat'
+  | 'band' | 'bor' | 'bxor' | 'shl' | 'shr' | 'eq' | 'lt' | 'le'
+  | 'and' | 'or' | 'not' | 'unm' | 'len' | 'bnot'
+]]
+local parser = {}
+local lpeg = require("lpeg")
+local scope
+if include ~= nil then
+    scope = include("./scope.lua")
+else
+    scope = dofile("../src/scope.lua")
+end
 
-AddCSLuaFile()
+lpeg.locale(lpeg)
+
+local P, S, V = lpeg.P, lpeg.S, lpeg.V
+local C, Carg, Cb, Cc = lpeg.C, lpeg.Carg, lpeg.Cb, lpeg.Cc
+local Cf, Cg, Cmt, Cp, Ct = lpeg.Cf, lpeg.Cg, lpeg.Cmt, lpeg.Cp, lpeg.Ct
+local alpha, digit, alnum = lpeg.alpha, lpeg.digit, lpeg.alnum
+local xdigit = lpeg.xdigit
+local space = lpeg.space
+
+local lineno = scope.lineno
+local new_scope, end_scope = scope.new_scope, scope.end_scope
+local new_function, end_function = scope.new_function, scope.end_function
+local begin_loop, end_loop = scope.begin_loop, scope.end_loop
+local insideloop = scope.insideloop
+
+--some stuff for getting glua comments
+local BEGIN_COMMENT = lpeg.P("/*")
+local END_COMMENT = lpeg.P("*/")
+local NOT_BEGIN = (1 - BEGIN_COMMENT)^0
+local NOT_END = (1 - END_COMMENT)^0
+local FULL_COMMENT_CONTENTS = BEGIN_COMMENT * NOT_END * END_COMMENT
+
+-- error message auxiliary functions
+
+-- creates an error message for the input string
+local function syntaxerror (errorinfo, pos, msg)
+  local l, c = lineno(errorinfo.subject, pos)
+  local error_msg = "%s:%d:%d: syntax error, %s"
+  return string.format(error_msg, errorinfo.filename, l, c, msg)
+end
 
-ENT.Type = "point"
-ENT.DisableDuplicator = true
+-- gets the farthest failure position
+local function getffp (s, i, t)
+  return t.ffp or i, t
+end
 
---
--- Make this entity always networked
---
-function ENT:UpdateTransmitState() return TRANSMIT_ALWAYS end
+-- gets the table that contains the error information
+local function geterrorinfo ()
+  return Cmt(Carg(1), getffp) * (C(V"OneWord") + Cc("EOF")) /
+  function (t, u)
+    t.unexpected = u
+    return t
+  end
+end
 
---
--- Networked / Saved Data
---
-function ENT:SetupDataTables()
+-- creates an errror message using the farthest failure position
+local function errormsg ()
+  return geterrorinfo() /
+  function (t)
+    local p = t.ffp or 1
+    local msg = "unexpected '%s', expecting %s"
+    msg = string.format(msg, t.unexpected, t.expected)
+    return nil, syntaxerror(t, p, msg)
+  end
+end
 
-	self:NetworkVar( "Vector", 0, "TopColor", { KeyName = "topcolor", Edit = { type = "VectorColor", category = "Main", order = 1 } } )
-	self:NetworkVar( "Vector", 1, "BottomColor", { KeyName = "bottomcolor", Edit = { type = "VectorColor", category = "Main", title = "Color Bottom", order = 2 } } )
-	self:NetworkVar( "Float", 0, "FadeBias", { KeyName = "fadebias", Edit = { type = "Float", category = "Main", min = 0, max = 1, order = 3 } } )
+-- reports a syntactic error
+local function report_error ()
+  return errormsg()
+end
 
-	self:NetworkVar( "Float", 4, "SunSize", { KeyName = "sunsize", Edit = { type = "Float", min = 0, max = 10, category = "Sun" } } )
-	self:NetworkVar( "Vector", 2, "SunNormal", { KeyName = "sunnormal" } ) -- No editing this - it's for coders only
-	self:NetworkVar( "Vector", 3, "SunColor", { KeyName = "suncolor", Edit = { type = "VectorColor", category = "Sun" } } )
+-- sets the farthest failure position and the expected tokens
+local function setffp (s, i, t, n)
+  if not t.ffp or i > t.ffp then
+    t.ffp = i
+    t.list = {} ; t.list[n] = n
+    t.expected = "'" .. n .. "'"
+  elseif i == t.ffp then
+    if not t.list[n] then
+      t.list[n] = n
+      t.expected = "'" .. n .. "', " .. t.expected
+    end
+  end
+  return false
+end
 
-	self:NetworkVar( "Float", 2, "DuskScale", { KeyName = "duskscale", Edit = { type = "Float", min = 0, max = 1, category = "Dusk" } } )
-	self:NetworkVar( "Float", 3, "DuskIntensity", { KeyName = "duskintensity", Edit = { type = "Float", min = 0, max = 10, category = "Dusk" } } )
-	self:NetworkVar( "Vector", 4, "DuskColor", { KeyName = "duskcolor", Edit = { type = "VectorColor", category = "Dusk" } } )
+local function updateffp (name)
+  return Cmt(Carg(1) * Cc(name), setffp)
+end
 
-	self:NetworkVar( "Bool", 0, "DrawStars", { KeyName = "drawstars", Edit = { type = "Boolean", category = "Stars", order = 10 } } )
-	self:NetworkVar( "String", 0, "StarTexture", { KeyName = "startexture", Edit = { type = "Texture", group = "Stars", category = "Stars", order = 11 } } )
+--Fixes strings
+local function fix_str (str)
+  str = string.gsub(str, "\\a", "\a")
+  str = string.gsub(str, "\\b", "\b")
+  str = string.gsub(str, "\\f", "\f")
+  str = string.gsub(str, "\\n", "\n")
+  str = string.gsub(str, "\\r", "\r")
+  str = string.gsub(str, "\\t", "\t")
+  str = string.gsub(str, "\\v", "\v")
+  str = string.gsub(str, "\\\n", "\n")
+  str = string.gsub(str, "\\\r", "\n")
+  str = string.gsub(str, "\\'", "'")
+  str = string.gsub(str, '\\"', '"')
+  str = string.gsub(str, '\\\\', '\\')
+  return str
+end
 
-	self:NetworkVarElement( "Angle", 0, 'p', "StarScale", { KeyName = "starscale", Edit = { type = "Float", min = 0, max = 5, category = "Stars", order = 12 } } )
-	self:NetworkVarElement( "Angle", 0, 'y', "StarFade", { KeyName = "starfade", Edit = { type = "Float", min = 0, max = 5, category = "Stars", order = 13 } } )
-	self:NetworkVarElement( "Angle", 0, 'r', "StarSpeed", { KeyName = "starspeed", Edit = { type = "Float", min = 0, max = 5, category = "Stars", order = 14 } } )
+-- regular combinators and auxiliary functions
 
-	self:NetworkVar( "Float", 1, "HDRScale", { KeyName = "hdrscale", Edit = { type = "Float", category = "Main", min = 0, max = 1, order = 4 } } )
+local function token (pat, name)
+  return pat * V"Skip" + updateffp(name) * P(false)
+end
 
-	--
-	-- Entity defaults
-	--
-	if ( SERVER ) then
+local function symb (str)
+  return token (P(str), str)
+end
 
-		self:SetTopColor( Vector( 0.2, 0.5, 1.0 ) )
-		self:SetBottomColor( Vector( 0.8, 1.0, 1.0 ) )
-		self:SetFadeBias( 1 )
+local function kw (str)
+  return token (P(str) * -V"idRest", str)
+end
 
+local function taggedCap (tag, pat)
+  return Ct(Cg(Cp(), "pos") * Cg(Cc(tag), "tag") * pat)
+end
 
-		self:SetSunNormal( Vector( 0.4, 0.0, 0.01 ) )
-		self:SetSunColor( Vector( 0.2, 0.1, 0.0 ) )
-		self:SetSunSize( 2.0 )
+local function unaryop (op, e)
+  return { tag = "Op", pos = e.pos, [1] = op, [2] = e }
+end
 
-		self:SetDuskColor( Vector( 1.0, 0.2, 0.0 ) )
-		self:SetDuskScale( 1 )
-		self:SetDuskIntensity( 1 )
+local function binaryop (e1, op, e2)
+  if not op then
+    return e1
+  elseif op == "add" or
+         op == "sub" or
+         op == "mul" or
+         op == "div" or
+         op == "idiv" or
+         op == "mod" or
+         op == "pow" or
+         op == "concat" or
+         op == "band" or
+         op == "bor" or
+         op == "bxor" or
+         op == "shl" or
+         op == "shr" or
+         op == "eq" or
+         op == "lt" or
+         op == "le" or
+         op == "and" or
+         op == "or" then
+    return { tag = "Op", pos = e1.pos, [1] = op, [2] = e1, [3] = e2 }
+  elseif op == "ne" then
+    return unaryop ("not", { tag = "Op", pos = e1.pos, [1] = "eq", [2] = e1, [3] = e2 })
+  elseif op == "gt" then
+    return { tag = "Op", pos = e1.pos, [1] = "lt", [2] = e2, [3] = e1 }
+  elseif op == "ge" then
+    return { tag = "Op", pos = e1.pos, [1] = "le", [2] = e2, [3] = e1 }
+  end
+end
 
-		self:SetDrawStars( true )
-		self:SetStarSpeed( 0.01 )
-		self:SetStarScale( 0.5 )
-		self:SetStarFade( 1.5 )
-		self:SetStarTexture( "skybox/starfield" )
+local function chainl (pat, sep, a)
+  return Cf(pat * Cg(sep * pat)^0, binaryop) + a
+end
 
-		self:SetHDRScale( 0.66 )
+local function chainl1 (pat, sep)
+  return Cf(pat * Cg(sep * pat)^0, binaryop)
+end
 
-	end
+local function sepby (pat, sep, tag)
+  return taggedCap(tag, (pat * (sep * pat)^0)^(-1))
+end
 
+local function sepby1 (pat, sep, tag)
+  return taggedCap(tag, pat * (sep * pat)^0)
 end
 
-function ENT:Initialize()
+-- grammar
+
+local G = { V"Lua",
+  Lua = V"Shebang"^(-1) * V"Skip" * V"Chunk" * -1 + report_error();
+  -- parser
+  Chunk = V"Block";
+  StatList = (symb(";") + V"Stat")^0;
+  Var = V"Id";
+  Id = taggedCap("Id", token(V"Name", "Name"));
+  FunctionDef = kw("function") * V"FuncBody";
+  FieldSep = symb(",") + symb(";");
+  Field = taggedCap("Pair", (symb("[") * V"Expr" * symb("]") * symb("=") * V"Expr") +
+                    (taggedCap("String", token(V"Name", "Name")) * symb("=") * V"Expr")) +
+          V"Expr";
+  FieldList = (V"Field" * (V"FieldSep" * V"Field")^0 * V"FieldSep"^(-1))^(-1);
+  Constructor = taggedCap("Table", symb("{") * V"FieldList" * symb("}"));
+  NameList = sepby1(V"Id", symb(","), "NameList");
+  ExpList = sepby1(V"Expr", symb(","), "ExpList");
+  FuncArgs = symb("(") * (V"Expr" * (symb(",") * V"Expr")^0)^(-1) * symb(")") +
+             V"Constructor" +
+             taggedCap("String", token(V"String", "String"));
+  Expr = V"SubExpr_1";
+  SubExpr_1 = chainl1(V"SubExpr_2", V"OrOp");
+  SubExpr_2 = chainl1(V"SubExpr_3", V"AndOp");
+  SubExpr_3 = chainl1(V"SubExpr_4", V"RelOp");
+  SubExpr_4 = chainl1(V"SubExpr_5", V"BOrOp");
+  SubExpr_5 = chainl1(V"SubExpr_6", V"BXorOp");
+  SubExpr_6 = chainl1(V"SubExpr_7", V"BAndOp");
+  SubExpr_7 = chainl1(V"SubExpr_8", V"ShiftOp");
+  SubExpr_8 = V"SubExpr_9" * V"ConOp" * V"SubExpr_8" / binaryop +
+              V"SubExpr_9";
+  SubExpr_9 = chainl1(V"SubExpr_10", V"AddOp");
+  SubExpr_10 = chainl1(V"SubExpr_11", V"MulOp");
+  SubExpr_11 = V"UnOp" * V"SubExpr_11" / unaryop +
+              V"SubExpr_12";
+  SubExpr_12 = V"SimpleExp" * (V"PowOp" * V"SubExpr_11")^(-1) / binaryop;
+  SimpleExp = taggedCap("Number", token(V"Number", "Number")) +
+              taggedCap("String", token(V"String", "String")) +
+              taggedCap("Nil", kw("nil")) +
+              taggedCap("False", kw("false")) +
+              taggedCap("True", kw("true")) +
+              taggedCap("Dots", symb("...")) +
+              V"FunctionDef" +
+              V"Constructor" +
+              V"SuffixedExp";
+  SuffixedExp = Cf(V"PrimaryExp" * (
+                  taggedCap("DotIndex", symb(".") * taggedCap("String", token(V"Name", "Name"))) +
+                  taggedCap("ArrayIndex", symb("[") * V"Expr" * symb("]")) +
+                  taggedCap("Invoke", Cg(symb(":") * taggedCap("String", token(V"Name", "Name")) * V"FuncArgs")) +
+                  taggedCap("Call", V"FuncArgs")
+                )^0, function (t1, t2)
+                       if t2 then
+                         if t2.tag == "Call" or t2.tag == "Invoke" then
+                           local t = {tag = t2.tag, pos = t1.pos, [1] = t1}
+                           for k, v in ipairs(t2) do
+                             table.insert(t, v)
+                           end
+                           return t
+                         else
+                           return {tag = "Index", pos = t1.pos, [1] = t1, [2] = t2[1]}
+                         end
+                       end
+                       return t1
+                     end);
+  PrimaryExp = V"Var" +
+               taggedCap("Paren", symb("(") * V"Expr" * symb(")"));
+  Block = taggedCap("Block", V"StatList" * V"RetStat"^(-1));
+  IfStat = taggedCap("If",
+             kw("if") * V"Expr" * kw("then") * V"Block" *
+             (kw("elseif") * V"Expr" * kw("then") * V"Block")^0 *
+             (kw("else") * V"Block")^(-1) *
+             kw("end"));
+  WhileStat = taggedCap("While", kw("while") * V"Expr" *
+                kw("do") * V"Block" * kw("end"));
+  DoStat = kw("do") * V"Block" * kw("end") /
+           function (t)
+             t.tag = "Do"
+             return t
+           end;
+  ForBody = kw("do") * V"Block";
+  ForNum = taggedCap("Fornum",
+             V"Id" * symb("=") * V"Expr" * symb(",") *
+             V"Expr" * (symb(",") * V"Expr")^(-1) *
+             V"ForBody");
+  ForGen = taggedCap("Forin", V"NameList" * kw("in") * V"ExpList" * V"ForBody");
+  ForStat = kw("for") * (V"ForNum" + V"ForGen") * kw("end");
+  RepeatStat = taggedCap("Repeat", kw("repeat") * V"Block" *
+                 kw("until") * V"Expr");
+  FuncName = Cf(V"Id" * (symb(".") * taggedCap("String", token(V"Name", "Name")))^0,
+             function (t1, t2)
+               if t2 then
+                 return {tag = "Index", pos = t1.pos, [1] = t1, [2] = t2}
+               end
+               return t1
+             end) * (symb(":") * taggedCap("String", token(V"Name", "Name")))^(-1) /
+             function (t1, t2)
+               if t2 then
+                 return {tag = "Index", pos = t1.pos, is_method = true, [1] = t1, [2] = t2}
+               end
+               return t1
+             end;
+  ParList = V"NameList" * (symb(",") * symb("...") * taggedCap("Dots", Cp()))^(-1) /
+            function (t, v)
+              if v then table.insert(t, v) end
+              return t
+            end +
+            symb("...") * taggedCap("Dots", Cp()) /
+            function (v)
+              return {v}
+            end +
+            P(true) / function () return {} end;
+  -- Cc({}) generates a strange bug when parsing [[function t:a() end ; function t.a() end]]
+  -- the bug is to add the parameter self to the second function definition
+  --FuncBody = taggedCap("Function", symb("(") * (V"ParList" + Cc({})) * symb(")") * V"Block" * kw("end"));
+  FuncBody = taggedCap("Function", symb("(") * V"ParList" * symb(")") * V"Block" * kw("end"));
+  FuncStat = taggedCap("Set", kw("function") * V"FuncName" * V"FuncBody") /
+             function (t)
+               if t[1].is_method then table.insert(t[2][1], 1, {tag = "Id", [1] = "self"}) end
+               t[1] = {t[1]}
+               t[2] = {t[2]}
+               return t
+             end;
+  LocalFunc = taggedCap("Localrec", kw("function") * V"Id" * V"FuncBody") /
+              function (t)
+                t[1] = {t[1]}
+                t[2] = {t[2]}
+                return t
+              end;
+  LocalAssign = taggedCap("Local", V"NameList" * ((symb("=") * V"ExpList") + Ct(Cc())));
+  LocalStat = kw("local") * (V"LocalFunc" + V"LocalAssign");
+  LabelStat = taggedCap("Label", symb("::") * token(V"Name", "Name") * symb("::"));
+  BreakStat = taggedCap("Break", kw("break"));
+  ContinueStat = taggedCap("Continue", kw("continue"));
+  GoToStat = taggedCap("Goto", kw("goto") * token(V"Name", "Name"));
+  RetStat = taggedCap("Return", kw("return") * (V"Expr" * (symb(",") * V"Expr")^0)^(-1) * symb(";")^(-1));
+  ExprStat = Cmt(
+             (V"SuffixedExp" *
+                (Cc(function (...)
+                           local vl = {...}
+                           local el = vl[#vl]
+                           table.remove(vl)
+                           for k, v in ipairs(vl) do
+                             if v.tag == "Id" or v.tag == "Index" then
+                               vl[k] = v
+                             else
+                               -- invalid assignment
+                               return false
+                             end
+                           end
+                           vl.tag = "VarList"
+                           vl.pos = vl[1].pos
+                           return true, {tag = "Set", pos = vl.pos, [1] = vl, [2] = el}
+                         end) * V"Assignment"))
+             +
+             (V"SuffixedExp" *
+                (Cc(function (s)
+                           if s.tag == "Call" or
+                              s.tag == "Invoke" then
+                             return true, s
+                           end
+                           -- invalid statement
+                           return false
+                         end)))
+             , function (s, i, s1, f, ...) return f(s1, ...) end);
+  Assignment = ((symb(",") * V"SuffixedExp")^1)^(-1) * symb("=") * V"ExpList";
+  Stat = V"IfStat" + V"WhileStat" + V"DoStat" + V"ForStat" +
+         V"RepeatStat" + V"FuncStat" + V"LocalStat" + V"LabelStat" +
+         V"BreakStat" + V"GoToStat" + V"ExprStat" + V"ContinueStat";
+  -- lexer
+  Space = space^1;
+  Equals = P"="^0;
+  Open = "[" * Cg(V"Equals", "init") * "[" * P"\n"^(-1);
+  Close = "]" * C(V"Equals") * "]";
+  CloseEQ = Cmt(V"Close" * Cb("init"),
+            function (s, i, a, b) return a == b end);
+  LongString = V"Open" * C((P(1) - V"CloseEQ")^0) * V"Close" /
+               function (s, o) return s end;
+  Comment = P"--" * V"LongString" / function () return end +
+            P"--" * (P(1) - P"\n")^0 +
+            P"//" * (P(1) - P"\n")^0 +
+            C(FULL_COMMENT_CONTENTS) / function() return end;
+  Skip = (V"Space" + V"Comment")^0;
+  idStart = alpha + P("_");
+  idRest = alnum + P("_");
+  Keywords = P("and") + "break" + "do" + "elseif" + "else" + "end" +
+             "false" + "for" + "function" + "goto" + "if" + "in" +
+             "local" + "nil" + "not" + "or" + "repeat" + "return" +
+             "then" + "true" + "until" + "while" + "continue";
+  Reserved = V"Keywords" * -V"idRest";
+  Identifier = V"idStart" * V"idRest"^0;
+  Name = -V"Reserved" * C(V"Identifier") * -V"idRest";
+  Hex = (P("0x") + P("0X")) * xdigit^1;
+  Expo = S("eE") * S("+-")^(-1) * digit^1;
+  Float = (((digit^1 * P(".") * digit^0) +
+          (P(".") * digit^1)) * V"Expo"^(-1)) +
+          (digit^1 * V"Expo");
+  Int = digit^1;
+  Number = C(V"Hex" + V"Float" + V"Int") /
+           function (n) return tonumber(n) end;
+  ShortString = P'"' * C(((P'\\' * P(1)) + (P(1) - P'"'))^0) * P'"' +
+                P"'" * C(((P"\\" * P(1)) + (P(1) - P"'"))^0) * P"'";
+  String = V"LongString" + (V"ShortString" / function (s)
+      --print("instead of " .. s .. " i return " .. fix_str(s))
+      return s end);
+      --return fix_str(s) end);
+  OrOp = kw("or") / "or" +
+         symb("||") / "or";
+  AndOp = kw("and") / "and" +
+          symb("&&") / "and";
+  RelOp = symb("~=") / "ne" +
+          symb("==") / "eq" +
+          symb("<=") / "le" +
+          symb(">=") / "ge" +
+          symb("<") / "lt" +
+          symb(">") / "gt" +
+          symb("!=") / "ne";
+  BOrOp = symb("|") / "bor";
+  BXorOp = symb("~") / "bxor";
+  BAndOp = symb("&") / "band";
+  ShiftOp = symb("<<") / "shl" +
+            symb(">>") / "shr";
+  ConOp = symb("..") / "concat";
+  AddOp = symb("+") / "add" +
+          symb("-") / "sub";
+  MulOp = symb("*") / "mul" +
+          --symb("//") / "idiv" +
+          symb("/") / "div" +
+          symb("%") / "mod";
+  UnOp = kw("not") / "not" +
+         symb("-") / "unm" +
+         symb("#") / "len" +
+         symb("~") / "bnot" +
+         symb("!") / "not";
+  PowOp = symb("^") / "pow";
+  Shebang = P"#" * (P(1) - P"\n")^0 * P"\n";
+  -- for error reporting
+  OneWord = V"Name" + V"Number" + V"String" + V"Reserved" + P("...") + P(1);
+}
+
+local function exist_label (env, scope, stm)
+  local l = stm[1]
+  for s=scope, 0, -1 do
+    if env[s]["label"][l] then return true end
+  end
+  return false
 end
 
-function ENT:KeyValue( key, value )
+local function set_label (env, label, pos)
+  local scope = env.scope
+  local l = env[scope]["label"][label]
+  if not l then
+    env[scope]["label"][label] = { name = label, pos = pos }
+    return true
+  else
+    local msg = "label '%s' already defined at line %d"
+    local line = lineno(env.errorinfo.subject, l.pos)
+    msg = string.format(msg, label, line)
+    return nil, syntaxerror(env.errorinfo, pos, msg)
+  end
+end
 
-	if ( self:SetNetworkKeyValue( key, value ) ) then
-		return
-	end
+local function set_pending_goto (env, stm)
+  local scope = env.scope
+  table.insert(env[scope]["goto"], stm)
+  return true
+end
 
-	-- TODO: sunposmethod
-	-- 		0 : "Custom - Use the Sun Normal to position the sun"
-	--		1 : "Automatic - Find a env_sun entity and use that"
+local function verify_pending_gotos (env)
+  for s=env.maxscope, 0, -1 do
+    for k, v in ipairs(env[s]["goto"]) do
+      if not exist_label(env, s, v) then
+        local msg = "no visible label '%s' for <goto>"
+        msg = string.format(msg, v[1])
+        return nil, syntaxerror(env.errorinfo, v.pos, msg)
+      end
+    end
+  end
+  return true
+end
 
+local function set_vararg (env, is_vararg)
+  env["function"][env.fscope].is_vararg = is_vararg
 end
 
-function ENT:Think()
+local traverse_stm, traverse_exp, traverse_var
+local traverse_block, traverse_explist, traverse_varlist, traverse_parlist
+
+function traverse_parlist (env, parlist)
+  local len = #parlist
+  local is_vararg = false
+  if len > 0 and parlist[len].tag == "Dots" then
+    is_vararg = true
+  end
+  set_vararg(env, is_vararg)
+  return true
+end
 
-	--
-	-- Find an env_sun - if we don't already have one.
-	--
-	if ( SERVER && self.EnvSun == nil ) then
+local function traverse_function (env, exp)
+  new_function(env)
+  new_scope(env)
+  local status, msg = traverse_parlist(env, exp[1])
+  if not status then return status, msg end
+  status, msg = traverse_block(env, exp[2])
+  if not status then return status, msg end
+  end_scope(env)
+  end_function(env)
+  return true
+end
 
-		-- so this closure only gets called once - even if it fails
-		self.EnvSun = false
+local function traverse_op (env, exp)
+  local status, msg = traverse_exp(env, exp[2])
+  if not status then return status, msg end
+  if exp[3] then
+    status, msg = traverse_exp(env, exp[3])
+    if not status then return status, msg end
+  end
+  return true
+end
 
-		local list = ents.FindByClass( "env_sun" )
-		if ( #list > 0 ) then
-			self.EnvSun = list[1]
-		end
+local function traverse_paren (env, exp)
+  local status, msg = traverse_exp(env, exp[1])
+  if not status then return status, msg end
+  return true
+end
 
-	end
+local function traverse_table (env, fieldlist)
+  for k, v in ipairs(fieldlist) do
+    local tag = v.tag
+    if tag == "Pair" then
+      local status, msg = traverse_exp(env, v[1])
+      if not status then return status, msg end
+      status, msg = traverse_exp(env, v[2])
+      if not status then return status, msg end
+    else
+      local status, msg = traverse_exp(env, v)
+      if not status then return status, msg end
+    end
+  end
+  return true
+end
 
-	--
-	-- If we have a sun - force our sun normal to its value
-	--
-	if ( SERVER && IsValid( self.EnvSun ) ) then
+local function traverse_vararg (env, exp)
+  if not env["function"][env.fscope].is_vararg then
+    local msg = "cannot use '...' outside a vararg function"
+    return nil, syntaxerror(env.errorinfo, exp.pos, msg)
+  end
+  return true
+end
 
-		local vec = self.EnvSun:GetInternalVariable( "m_vDirection" )
+local function traverse_call (env, call)
+  local status, msg = traverse_exp(env, call[1])
+  if not status then return status, msg end
+  for i=2, #call do
+    status, msg = traverse_exp(env, call[i])
+    if not status then return status, msg end
+  end
+  return true
+end
 
-		if ( isvector( vec ) ) then
-			self:SetSunNormal( vec )
-		end
+local function traverse_invoke (env, invoke)
+  local status, msg = traverse_exp(env, invoke[1])
+  if not status then return status, msg end
+  for i=3, #invoke do
+    status, msg = traverse_exp(env, invoke[i])
+    if not status then return status, msg end
+  end
+  return true
+end
 
-	end
+local function traverse_assignment (env, stm)
+  local status, msg = traverse_varlist(env, stm[1])
+  if not status then return status, msg end
+  status, msg = traverse_explist(env, stm[2])
+  if not status then return status, msg end
+  return true
+end
 
-	--
-	-- Become the active sky again if we're not already
-	--
-	if ( CLIENT && g_SkyPaint != self ) then
+local function traverse_break (env, stm)
+  if not insideloop(env) then
+    local msg = "<break> not inside a loop"
+    return nil, syntaxerror(env.errorinfo, stm.pos, msg)
+  end
+  return true
+end
 
-		if ( !IsValid( g_SkyPaint ) ) then
-			g_SkyPaint = self
-		end
+local function traverse_continue (env, stm)
+  if not insideloop(env) then
+    local msg = "<continue> not inside a loop"
+    return nil, syntaxerror(env.errorinfo, stm.pos, msg)
+  end
+  return true
+end
+
+local function traverse_forin (env, stm)
+  begin_loop(env)
+  new_scope(env)
+  local status, msg = traverse_explist(env, stm[2])
+  if not status then return status, msg end
+  status, msg = traverse_block(env, stm[3])
+  if not status then return status, msg end
+  end_scope(env)
+  end_loop(env)
+  return true
+end
+
+local function traverse_fornum (env, stm)
+  local status, msg
+  begin_loop(env)
+  new_scope(env)
+  status, msg = traverse_exp(env, stm[2])
+  if not status then return status, msg end
+  status, msg = traverse_exp(env, stm[3])
+  if not status then return status, msg end
+  if stm[5] then
+    status, msg = traverse_exp(env, stm[4])
+    if not status then return status, msg end
+    status, msg = traverse_block(env, stm[5])
+    if not status then return status, msg end
+  else
+    status, msg = traverse_block(env, stm[4])
+    if not status then return status, msg end
+  end
+  end_scope(env)
+  end_loop(env)
+  return true
+end
+
+local function traverse_goto (env, stm)
+  local status, msg = set_pending_goto(env, stm)
+  if not status then return status, msg end
+  return true
+end
+
+local function traverse_if (env, stm)
+  local len = #stm
+  if len % 2 == 0 then
+    for i=1, len, 2 do
+      local status, msg = traverse_exp(env, stm[i])
+      if not status then return status, msg end
+      status, msg = traverse_block(env, stm[i+1])
+      if not status then return status, msg end
+    end
+  else
+    for i=1, len-1, 2 do
+      local status, msg = traverse_exp(env, stm[i])
+      if not status then return status, msg end
+      status, msg = traverse_block(env, stm[i+1])
+      if not status then return status, msg end
+    end
+    local status, msg = traverse_block(env, stm[len])
+    if not status then return status, msg end
+  end
+  return true
+end
+
+local function traverse_label (env, stm)
+  local status, msg = set_label(env, stm[1], stm.pos)
+  if not status then return status, msg end
+  return true
+end
+
+local function traverse_let (env, stm)
+  local status, msg = traverse_explist(env, stm[2])
+  if not status then return status, msg end
+  return true
+end
+
+local function traverse_letrec (env, stm)
+  local status, msg = traverse_exp(env, stm[2][1])
+  if not status then return status, msg end
+  return true
+end
+
+local function traverse_repeat (env, stm)
+  begin_loop(env)
+  local status, msg = traverse_block(env, stm[1])
+  if not status then return status, msg end
+  status, msg = traverse_exp(env, stm[2])
+  if not status then return status, msg end
+  end_loop(env)
+  return true
+end
 
-	end
+local function traverse_return (env, stm)
+  local status, msg = traverse_explist(env, stm)
+  if not status then return status, msg end
+  return true
+end
 
+local function traverse_while (env, stm)
+  begin_loop(env)
+  local status, msg = traverse_exp(env, stm[1])
+  if not status then return status, msg end
+  status, msg = traverse_block(env, stm[2])
+  if not status then return status, msg end
+  end_loop(env)
+  return true
 end
 
---
--- To prevent server insanity - only let admins edit the sky.
---
-function ENT:CanEditVariables( ply )
+function traverse_var (env, var)
+  local tag = var.tag
+  if tag == "Id" then -- `Id{ <string> }
+    return true
+  elseif tag == "Index" then -- `Index{ expr expr }
+    local status, msg = traverse_exp(env, var[1])
+    if not status then return status, msg end
+    status, msg = traverse_exp(env, var[2])
+    if not status then return status, msg end
+    return true
+  else
+    error("expecting a variable, but got a " .. tag)
+  end
+end
 
-	return ply:IsAdmin()
+function traverse_varlist (env, varlist)
+  for k, v in ipairs(varlist) do
+    local status, msg = traverse_var(env, v)
+    if not status then return status, msg end
+  end
+  return true
+end
+
+function traverse_exp (env, exp)
+  local tag = exp.tag
+  if tag == "Nil" or
+     tag == "True" or
+     tag == "False" or
+     tag == "Number" or -- `Number{ <number> }
+     tag == "String" then -- `String{ <string> }
+    return true
+  elseif tag == "Dots" then
+    return traverse_vararg(env, exp)
+  elseif tag == "Function" then -- `Function{ { `Id{ <string> }* `Dots? } block }
+    return traverse_function(env, exp)
+  elseif tag == "Table" then -- `Table{ ( `Pair{ expr expr } | expr )* }
+    return traverse_table(env, exp)
+  elseif tag == "Op" then -- `Op{ opid expr expr? }
+    return traverse_op(env, exp)
+  elseif tag == "Paren" then -- `Paren{ expr }
+    return traverse_paren(env, exp)
+  elseif tag == "Call" then -- `Call{ expr expr* }
+    return traverse_call(env, exp)
+  elseif tag == "Invoke" then -- `Invoke{ expr `String{ <string> expr* }
+    return traverse_invoke(env, exp)
+  elseif tag == "Id" or -- `Id{ <string> }
+         tag == "Index" then -- `Index{ expr expr }
+    return traverse_var(env, exp)
+  else
+    error("expecting an expression, but got a " .. tag)
+  end
+end
+
+function traverse_explist (env, explist)
+  for k, v in ipairs(explist) do
+    local status, msg = traverse_exp(env, v)
+    if not status then return status, msg end
+  end
+  return true
+end
+
+function traverse_stm (env, stm)
+  local tag = stm.tag
+  if tag == "Do" then -- `Do{ stat* }
+    return traverse_block(env, stm)
+  elseif tag == "Set" then -- `Set{ {lhs+} {expr+} }
+    return traverse_assignment(env, stm)
+  elseif tag == "While" then -- `While{ expr block }
+    return traverse_while(env, stm)
+  elseif tag == "Repeat" then -- `Repeat{ block expr }
+    return traverse_repeat(env, stm)
+  elseif tag == "If" then -- `If{ (expr block)+ block? }
+    return traverse_if(env, stm)
+  elseif tag == "Fornum" then -- `Fornum{ ident expr expr expr? block }
+    return traverse_fornum(env, stm)
+  elseif tag == "Forin" then -- `Forin{ {ident+} {expr+} block }
+    return traverse_forin(env, stm)
+  elseif tag == "Local" then -- `Local{ {ident+} {expr+}? }
+    return traverse_let(env, stm)
+  elseif tag == "Localrec" then -- `Localrec{ ident expr }
+    return traverse_letrec(env, stm)
+  elseif tag == "Goto" then -- `Goto{ <string> }
+    return traverse_goto(env, stm)
+  elseif tag == "Label" then -- `Label{ <string> }
+    return traverse_label(env, stm)
+  elseif tag == "Return" then -- `Return{ <expr>* }
+    return traverse_return(env, stm)
+  elseif tag == "Break" then
+    return traverse_break(env, stm)
+  elseif tag == "Continue" then
+    return traverse_continue(env,stm)
+  elseif tag == "Call" then -- `Call{ expr expr* }
+    return traverse_call(env, stm)
+  elseif tag == "Invoke" then -- `Invoke{ expr `String{ <string> } expr* }
+    return traverse_invoke(env, stm)
+  else
+    error("expecting a statement, but got a " .. tag)
+  end
+end
 
+function traverse_block (env, block)
+  local l = {}
+  new_scope(env)
+  for k, v in ipairs(block) do
+    local status, msg = traverse_stm(env, v)
+    if not status then return status, msg end
+  end
+  end_scope(env)
+  return true
 end
 
+
+local function traverse (ast, errorinfo)
+  assert(type(ast) == "table")
+  assert(type(errorinfo) == "table")
+  local env = { errorinfo = errorinfo, ["function"] = {} }
+  new_function(env)
+  set_vararg(env, true)
+  local status, msg = traverse_block(env, ast)
+  if not status then return status, msg end
+  end_function(env)
+  status, msg = verify_pending_gotos(env)
+  if not status then return status, msg end
+  return ast
+end
+
+function parser.parse (subject, filename)
+  local errorinfo = { subject = subject, filename = filename }
+  lpeg.setmaxstack(1000)
+  --debug.getregistry()["lpeg-maxstack"] = 1000
+  local ast, error_msg = lpeg.match(G, subject, nil, errorinfo)
+  if not ast then return ast, error_msg end
+  return traverse(ast, errorinfo)
+end
+
+return parser
+]==]
+
+local str2 = [=[
+--[[/////////////////
+
 ]]
+local foo = 1
+if foo then print("bar") end
+local function something(foo, bar)
+    print("foobar")
+end
+something(foo,4)
+]=]
 
 local min = glum.minify(str)
---local comp = glum.uglify(min)
+--local comp = ugly.uglify(min)
 print(min)
+print(string.format("Old size:%d\nNew size:%d",#str,#min))
 
 --[[
 local fuzzel = loadstring(f)()
diff --git a/test/test_output.lua b/test/test_output.lua
new file mode 100644
index 0000000..44eb5f6
--- /dev/null
+++ b/test/test_output.lua
@@ -0,0 +1,293 @@
+Finding string reps
+	1:
+		1:NetworkVar
+		2:96
+	2:
+		1:category
+		2:84
+	3:
+		1:KeyName
+		2:75
+	4:
+		1:NetworkVarElement
+		2:45
+	5:
+		1:Float
+		2:39
+	6:
+		1:VectorColor
+		2:36
+	7:
+		1:Edit
+		2:28
+	8:
+		1:type
+		2:28
+	9:
+		1:order
+		2:27
+	10:
+		1:EnvSun
+		2:20
+	11:
+		1:SetSunNormal
+		2:20
+	12:
+		1:Vector
+		2:20
+	13:
+		1:Stars
+		2:18
+	14:
+		1:UpdateTransmitState
+		2:17
+	15:
+		1:GetInternalVariable
+		2:17
+	16:
+		1:SetNetworkKeyValue
+		2:16
+	17:
+		1:DisableDuplicator
+		2:15
+	18:
+		1:skybox/starfield
+		2:14
+	19:
+		1:CanEditVariables
+		2:14
+	20:
+		1:SetDuskIntensity
+		2:14
+	21:
+		1:SetupDataTables
+		2:13
+	22:
+		1:SetStarTexture
+		2:12
+	23:
+		1:SetBottomColor
+		2:12
+	24:
+		1:duskintensity
+		2:11
+	25:
+		1:DuskIntensity
+		2:11
+	26:
+		1:m_vDirection
+		2:10
+	27:
+		1:SetDrawStars
+		2:10
+	28:
+		1:SetDuskColor
+		2:10
+	29:
+		1:SetDuskScale
+		2:10
+	30:
+		1:SetStarSpeed
+		2:10
+	31:
+		1:Color Bottom
+		2:10
+	32:
+		1:SetStarScale
+		2:10
+	33:
+		1:StarTexture
+		2:9
+	34:
+		1:SetFadeBias
+		2:9
+	35:
+		1:SetStarFade
+		2:9
+	36:
+		1:SetHDRScale
+		2:9
+	37:
+		1:Angle
+		2:9
+	38:
+		1:startexture
+		2:9
+	39:
+		1:BottomColor
+		2:9
+	40:
+		1:FindByClass
+		2:9
+	41:
+		1:SetTopColor
+		2:9
+	42:
+		1:SetSunColor
+		2:9
+	43:
+		1:bottomcolor
+		2:9
+	44:
+		1:min
+		2:8
+	45:
+		1:SetSunSize
+		2:8
+	46:
+		1:Main
+		2:8
+	47:
+		1:Initialize
+		2:8
+	48:
+		1:max
+		2:8
+	49:
+		1:drawstars
+		2:7
+	50:
+		1:duskscale
+		2:7
+	51:
+		1:DuskColor
+		2:7
+	52:
+		1:sunnormal
+		2:7
+	53:
+		1:starspeed
+		2:7
+	54:
+		1:DuskScale
+		2:7
+	55:
+		1:SunNormal
+		2:7
+	56:
+		1:DrawStars
+		2:7
+	57:
+		1:duskcolor
+		2:7
+	58:
+		1:StarSpeed
+		2:7
+	59:
+		1:starscale
+		2:7
+	60:
+		1:StarScale
+		2:7
+	61:
+		1:topcolor
+		2:6
+	62:
+		1:hdrscale
+		2:6
+	63:
+		1:fadebias
+		2:6
+	64:
+		1:suncolor
+		2:6
+	65:
+		1:SunColor
+		2:6
+	66:
+		1:StarFade
+		2:6
+	67:
+		1:FadeBias
+		2:6
+	68:
+		1:TopColor
+		2:6
+	69:
+		1:HDRScale
+		2:6
+	70:
+		1:KeyValue
+		2:6
+	71:
+		1:starfade
+		2:6
+	72:
+		1:Dusk
+		2:6
+	73:
+		1:Texture
+		2:5
+	74:
+		1:SunSize
+		2:5
+	75:
+		1:IsAdmin
+		2:5
+	76:
+		1:env_sun
+		2:5
+	77:
+		1:Boolean
+		2:5
+	78:
+		1:sunsize
+		2:5
+	79:
+		1:String
+		2:4
+	80:
+		1:group
+		2:3
+	81:
+		1:point
+		2:3
+	82:
+		1:Think
+		2:3
+	83:
+		1:title
+		2:3
+	84:
+		1:Bool
+		2:2
+	85:
+		1:Type
+		2:2
+	86:
+		1:Sun
+		2:2
+	87:
+		1:r
+		2:-1
+	88:
+		1:y
+		2:-1
+	89:
+		1:p
+		2:-1
+Found	1	locals as Local
+Found	1	locals as Local
+lhss is
+	1:e
+	2:a
+	3:b
+	4:c
+	5:f
+	6:d
+Before doing stringfor for the second time, olocalvar is
+	strings:
+		Float:e
+		NetworkVar:a
+		category:b
+		KeyName:c
+		VectorColor:f
+		NetworkVarElement:d
+	numlocals:2
+	lname:f
+	block:true
+	nids:
+	ids:
+Found	1	locals as Local
+Found	1	locals as Local
+ local e,a,b,c,f,d="Float","NetworkVar","category","KeyName","VectorColor","NetworkVarElement";AddCSLuaFile()ENT.Type="point";ENT.DisableDuplicator= true ;ENT.UpdateTransmitState= function() return TRANSMIT_ALWAYS end ;ENT.SetupDataTables= function()self[a]("Vector",0,"TopColor",{[c]="topcolor",["Edit"]={["type"]=f,[b]="Main",["order"]=1}})self[a]("Vector",1,"BottomColor",{[c]="bottomcolor",["Edit"]={["type"]=f,[b]="Main",["title"]="Color Bottom",["order"]=2}})self[a](e,0,"FadeBias",{[c]="fadebias",["Edit"]={["type"]=e,[b]="Main",["min"]=0,["max"]=1,["order"]=3}})self[a](e,4,"SunSize",{[c]="sunsize",["Edit"]={["type"]=e,["min"]=0,["max"]=10,[b]="Sun"}})self[a]("Vector",2,"SunNormal",{[c]="sunnormal"})self[a]("Vector",3,"SunColor",{[c]="suncolor",["Edit"]={["type"]=f,[b]="Sun"}})self[a](e,2,"DuskScale",{[c]="duskscale",["Edit"]={["type"]=e,["min"]=0,["max"]=1,[b]="Dusk"}})self[a](e,3,"DuskIntensity",{[c]="duskintensity",["Edit"]={["type"]=e,["min"]=0,["max"]=10,[b]="Dusk"}})self[a]("Vector",4,"DuskColor",{[c]="duskcolor",["Edit"]={["type"]=f,[b]="Dusk"}})self[a]("Bool",0,"DrawStars",{[c]="drawstars",["Edit"]={["type"]="Boolean",[b]="Stars",["order"]=10}})self[a]("String",0,"StarTexture",{[c]="startexture",["Edit"]={["type"]="Texture",["group"]="Stars",[b]="Stars",["order"]=11}})self[d]("Angle",0,"p","StarScale",{[c]="starscale",["Edit"]={["type"]=e,["min"]=0,["max"]=5,[b]="Stars",["order"]=12}})self[d]("Angle",0,"y","StarFade",{[c]="starfade",["Edit"]={["type"]=e,["min"]=0,["max"]=5,[b]="Stars",["order"]=13}})self[d]("Angle",0,"r","StarSpeed",{[c]="starspeed",["Edit"]={["type"]=e,["min"]=0,["max"]=5,[b]="Stars",["order"]=14}})self[a](e,1,"HDRScale",{[c]="hdrscale",["Edit"]={["type"]=e,[b]="Main",["min"]=0,["max"]=1,["order"]=4}}) if (SERVER) then self:SetTopColor(Vector(0.2,0.5,1))self:SetBottomColor(Vector(0.8,1,1))self:SetFadeBias(1)self:SetSunNormal(Vector(0.4,0,0.01))self:SetSunColor(Vector(0.2,0.1,0))self:SetSunSize(2)self:SetDuskColor(Vector(1,0.2,0))self:SetDuskScale(1)self:SetDuskIntensity(1)self:SetDrawStars( true )self:SetStarSpeed(0.01)self:SetStarScale(0.5)self:SetStarFade(1.5)self:SetStarTexture("skybox/starfield")self:SetHDRScale(0.66) end  end ;ENT.Initialize= function() end ;ENT.KeyValue= function(g,h,i) if (g:SetNetworkKeyValue(h,i)) then  return  end  end ;ENT.Think= function() if (SERVER and g.EnvSun== nil ) then g.EnvSun= false ;local j=ents.FindByClass("env_sun"); if (0<#j) then g.EnvSun=j[1]; end  end  if (SERVER and IsValid(g.EnvSun)) then local j=g.EnvSun:GetInternalVariable("m_vDirection"); if (isvector(j)) then g:SetSunNormal(j) end  end  if (CLIENT and  not g_SkyPaint~=g) then  if ( not IsValid(g_SkyPaint)) then g_SkyPaint=g; end  end  end ;ENT.CanEditVariables= function(g,j) return j:IsAdmin() end ;