Merge branch 'better-errors' into 0.5-branch

diff --git a/src/build-utils/bootstrap.lua b/src/build-utils/bootstrap.lua
index ba13651f2f46840bb976746d904882f905e98d28..a4b6fa50c7e7a82f06970bb2a13de089e9a90a46 100644 (file)
--- a/src/build-utils/bootstrap.lua
+++ b/src/build-utils/bootstrap.lua
@@ -12,7 +12,7 @@ for _, a in ipairs(arg) do
    if var then cfg[var] = val else table.insert (cfg.inputs, a) end
 end
 
--- metalua.mlc doesn't exit yet; this preload manager loads a mockup which is just
+-- metalua.mlc doesn't exist yet; this preload manager loads a mockup which is just
 -- sufficient to compile the real mlc.mlua
 package.preload['metalua.mlc'] = function()
 

diff --git a/src/compiler/gg.lua b/src/compiler/gg.lua
index 9a9ba2efc1a74e96df1297ec8828bb092084f8ac..db0d91c16f9b982f1ccc33eaba41e7980acd40af 100644 (file)
--- a/src/compiler/gg.lua
+++ b/src/compiler/gg.lua
@@ -94,11 +94,11 @@ local function raw_parse_sequence (lx, p)
       e=p[i]
       if type(e) == "string" then 
          if not lx:is_keyword (lx:next(), e) then
-            parse_error (lx, "Keyword '%s' expected", e) end
+            parse_error (lx, "A keyword was expected, probably `%s'.", e) end
       elseif is_parser (e) then
          table.insert (r, e (lx)) 
       else 
-         gg.parse_error (lx,"Sequence `%s': element #%i is not a string "..
+         gg.parse_error (lx,"Sequence `%s': element #%i is neither a string "..
                          "nor a parser: %s", 
                          p.name, i, table.tostring(e))
       end
@@ -210,7 +210,7 @@ function sequence (p)
    elseif type(p[1])=="string" then -- find name based on 1st keyword
       if #p==1 then p.name=p[1]
       elseif type(p[#p])=="string" then
-         p.name = p[1] .. " ... " . p[#p]
+         p.name = p[1] .. " ... " .. p[#p]
       else p.name = p[1] .. " ..." end
    else -- can't find a decent name
       p.name = "<anonymous>"
@@ -468,7 +468,7 @@ function expr (p)
          -- Check for non-associative operators, and complain if applicable. 
          -----------------------------------------
          elseif p2.assoc=="none" and p2.prec==prec then
-            parser_error (lx, "non-associative operator!")
+            parse_error (lx, "non-associative operator!")
 
          -----------------------------------------
          -- No infix operator suitable at that precedence

diff --git a/src/compiler/metalua.mlua b/src/compiler/metalua.mlua
index b3bdf0325c501795df37ca7709fd50fa91a2fb59..c25b981762df49b632c6992cb925f051dd1f7655 100644 (file)
--- a/src/compiler/metalua.mlua
+++ b/src/compiler/metalua.mlua
@@ -70,7 +70,7 @@ Compile and/or execute metalua programs. Parameters passed to the
 compiler should be prefixed with an option flag, hinting what must be
 done with them: take tham as file names to compile, as library names
 to load, as parameters passed to the running program... When option
-flags lack, metalua tries to adopt a "Do What I Mean" approach:
+flags are absent, metalua tries to adopt a "Do What I Mean" approach:
 
 - if no code (no library, no literal expression and no file) is
   specified, the first flag-less parameter is taken as a file name to

diff --git a/src/compiler/mlp_expr.lua b/src/compiler/mlp_expr.lua
index 213ccde22ec172ba6e4288b0691eefcf00b728bb..7e98a30681b4269faa8d6c0beffd6106204266f9 100644 (file)
--- a/src/compiler/mlp_expr.lua
+++ b/src/compiler/mlp_expr.lua
@@ -109,8 +109,16 @@ local _func_val = function (lx) return func_val(lx) end
 function id_or_literal (lx)
    local a = lx:next()
    if a.tag~="Id" and a.tag~="String" and a.tag~="Number" then
-      gg.parse_error (lx, "Unexpected expr token %s",
-                      _G.table.tostring (a, 'nohash'))
+      local msg
+      if a.tag=='Eof' then
+         msg = "End of file reached when an expression was expected"
+      elseif a.tag=='Keyword' then
+         msg = "An expression was expected, and `"..a[1]..
+            "' can't start an expression"
+      else
+         msg = "Unexpected expr token " .. _G.table.tostring (a, 'nohash')
+      end
+      gg.parse_error (lx, msg)
    end
    return a
 end

diff --git a/src/compiler/mlp_misc.lua b/src/compiler/mlp_misc.lua
index c09483d47be4d335c238778429d9eee3103ec380..bfdc376588c11d9682018afd8140a86d4c88ded2 100644 (file)
--- a/src/compiler/mlp_misc.lua
+++ b/src/compiler/mlp_misc.lua
@@ -135,7 +135,7 @@ function id2string (id)
       -- That is, without sugar:
       return {tag="String",  {tag="Index", {tag="Splice", id[1] }, 
                                            {tag="Number", 1 } } }
-   else error ("Identifier expected: "..table.tostring(id)) end
+   else error ("Identifier expected: ".._G.table.tostring(id, 'nohash')) end
 end
 
 --------------------------------------------------------------------------------

diff --git a/src/compiler/mlp_stat.lua b/src/compiler/mlp_stat.lua
index b959d96551bc3908b46d8c9faf7c1c874a35c451..c6edad170388cd004499347b0a4128981e8d940a 100644 (file)
--- a/src/compiler/mlp_stat.lua
+++ b/src/compiler/mlp_stat.lua
@@ -169,11 +169,20 @@ local function assign_or_call_stat_parser (lx)
    else 
       assert (#e > 0)
       if #e > 1 then 
-         gg.parse_error (lx, "comma is not a valid statement separator") end
+         gg.parse_error (lx, 
+            "comma is not a valid statement separator; statement can be "..
+            "separated by semicolons, or not separated at all") end
       if e[1].tag ~= "Call" and e[1].tag ~= "Invoke" then
-         gg.parse_error (lx, "This expression is of type '%s'; "..
-            "only function and method calls make valid statements", 
-            e[1].tag or "<list>")
+         local typename
+         if e[1].tag == 'Id' then 
+            typename = '("'..e[1][1]..'") is an identifier'
+         elseif e[1].tag == 'Op' then 
+            typename = "is an arithmetic operation"
+         else typename = "is of type '"..(e[1].tag or "<list>").."'" end
+
+         gg.parse_error (lx, "This expression " .. typename ..
+            "; a statement was expected, and only function and method call "..
+            "expressions can be used as statements");
       end
       return e[1]
    end

diff --git a/src/lib/strict.lua b/src/lib/strict.lua
index 8ca18fab3f11536010344977037c58d365963cae..772fc109b9f01060cd965af56773b703a9f7a3c2 100644 (file)
--- a/src/lib/strict.lua
+++ b/src/lib/strict.lua
@@ -6,18 +6,25 @@
 -- anywhere or assigned to inside a function.
 --
 
+local getinfo, error, rawset, rawget = debug.getinfo, error, rawset, rawget
+
 local mt = getmetatable(_G)
 if mt == nil then
   mt = {}
   setmetatable(_G, mt)
 end
 
-__STRICT = true
+__strict = true
 mt.__declared = {}
 
+local function what ()
+  local d = getinfo(3, "S")
+  return d and d.what or "C"
+end
+
 mt.__newindex = function (t, n, v)
-  if __STRICT and not mt.__declared[n] then
-    local w = debug.getinfo(2, "S").what
+  if __strict and not mt.__declared[n] then
+    local w = what()
     if w ~= "main" and w ~= "C" then
       error("assign to undeclared variable '"..n.."'", 2)
     end
@@ -27,7 +34,7 @@ mt.__newindex = function (t, n, v)
 end
   
 mt.__index = function (t, n)
-  if not mt.__declared[n] and debug.getinfo(2, "S").what ~= "C" then
+  if __strict and not mt.__declared[n] and what() ~= "C" then
     error("variable '"..n.."' is not declared", 2)
   end
   return rawget(t, n)

diff --git a/src/make.sh b/src/make.sh
index 242ec2b1389a8f0448d39d05ff0a3e1b59d8db36..bf6cc343a62e8644803ff95c6cbd555e322569fd 100755 (executable)
--- a/src/make.sh
+++ b/src/make.sh
@@ -9,7 +9,7 @@ BASE=${PWD}
 # Upon installation, everything will be moved to ${INSTALL_LIB} and ${INSTALL_BIN}
 
 if [ -z "${BUILD}" ]; then
-  BUILD=/tmp/metalua-build
+  BUILD=$(mkdir -p ../build; cd ../build; pwd)
 fi
 
 if [ -z "${BUILD_BIN}" ]; then