Misc changes, fixed up Object lib and tests.

1 files changed, 3 insertions, 3 deletions

diff --git a/nomsu.lua b/nomsu.lua
index 2b0b6dc..cc335ec 100644
--- a/nomsu.lua
+++ b/nomsu.lua
@@ -28,8 +28,8 @@ end
 re = require('re')
 lpeg = require('lpeg')
 lpeg.setmaxstack(10000)
-local P, R, V, S, Cg, C, Cp, B, Cmt
-P, R, V, S, Cg, C, Cp, B, Cmt = lpeg.P, lpeg.R, lpeg.V, lpeg.S, lpeg.Cg, lpeg.C, lpeg.Cp, lpeg.B, lpeg.Cmt
+local P, R, V, S, Cg, C, Cp, B
+P, R, V, S, Cg, C, Cp, B = lpeg.P, lpeg.R, lpeg.V, lpeg.S, lpeg.Cg, lpeg.C, lpeg.Cp, lpeg.B
 local utils = require('utils')
 local new_uuid = require('uuid')
 local immutable = require('immutable')
@@ -1303,7 +1303,7 @@ do
   stub_defs = {
     space = (P(' ') + P('\n..')) ^ 0,
     word = (NOMSU_DEFS.ident_char ^ 1 + NOMSU_DEFS.operator),
-    varname = (R('az', 'AZ', '09') + P('_') + NOMSU_DEFS.utf8_char) ^ 0
+    varname = (R('az', 'AZ', '09') + P('_') + NOMSU_DEFS.utf8_char + (-P("'") * NOMSU_DEFS.operator)) ^ 0
   }
   stub_pattern = re.compile([=[        {~ (%space->'') (('%' (%varname->'')) / %word)? ((%space->' ') (('%' (%varname->'')) / %word))* (%space->'') ~}
     ]=], stub_defs)