mirror of
https://github.com/notwa/lips
synced 2024-05-03 10:03:23 -07:00
allow _ in expr vars; tweak number matching
This commit is contained in:
parent
63644df1bc
commit
b80fb49a22
|
@ -174,9 +174,9 @@ function Expression:lex1(str, tokens)
|
||||||
return "bad octal number: "..considered..here
|
return "bad octal number: "..considered..here
|
||||||
end
|
end
|
||||||
num = tonumber(considered:sub(2), 8)
|
num = tonumber(considered:sub(2), 8)
|
||||||
elseif consider('#[0-9]*') then
|
elseif consider('#[0-9]+') then
|
||||||
num = tonumber(considered:sub(2))
|
num = tonumber(considered:sub(2))
|
||||||
elseif consider('[0-9]*') then
|
elseif consider('[0-9]+') then
|
||||||
num = tonumber(considered)
|
num = tonumber(considered)
|
||||||
end
|
end
|
||||||
if num == nil then
|
if num == nil then
|
||||||
|
@ -193,7 +193,7 @@ function Expression:lex1(str, tokens)
|
||||||
elseif consider_operator() then
|
elseif consider_operator() then
|
||||||
insert(tokens, {type='operator', value=considered})
|
insert(tokens, {type='operator', value=considered})
|
||||||
consume(#considered)
|
consume(#considered)
|
||||||
elseif consider('%w+') then
|
elseif consider('[%w_]+') then
|
||||||
local num = self.variables[considered]
|
local num = self.variables[considered]
|
||||||
if num == nil then
|
if num == nil then
|
||||||
return 'undefined variable "'..considered..'"'
|
return 'undefined variable "'..considered..'"'
|
||||||
|
|
Loading…
Reference in New Issue
Block a user