From 88ff27148b6ec56cd2ba81931ee1bace04c17869 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Thu, 14 Sep 2017 04:33:45 -0700 Subject: [PATCH] Rebuilt. --- nomsu.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nomsu.lua b/nomsu.lua index 2abf7da..01fef74 100644 --- a/nomsu.lua +++ b/nomsu.lua @@ -284,7 +284,7 @@ do ((%indent %new_line block ((%dedent (%new_line "..")?) / errors)) / (one_liner (%ws? (%new_line? ".."))?)) }) -> Thunk - word <- ({ !number {%wordchar+} }) -> Word + word <- ({ !number {%wordchar (!"'" %wordchar)*} }) -> Word expression <- ({ (longstring / string / number / variable / list / thunk / subexpression) }) -> Expression string <- ({ (!longstring) '"' {(("\" [^%nl]) / [^"%nl])*} '"' }) -> String @@ -300,7 +300,7 @@ do |}}) -> Longstring string_interpolation <- "\" %ws? (functioncall / expression) %ws? "\" number <- ({ {'-'? [0-9]+ ("." [0-9]+)?} }) -> Number - variable <- ({ ("%" {%wordchar+}) }) -> Var + variable <- ({ ("%" {%wordchar (!"'" %wordchar)*}) }) -> Var subexpression <- ("(" %ws? (functioncall / expression) %ws? ")")