Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

d: examples: reduce scopes

Browse Source 
* data/skeletons/lalr1.d (YYLocation.step): New.
* examples/d/calc/calc.y (Lexer): Reduce scopes to avoid uninitialized
varibles.
Factor the handling of locations.
We don't need lenChars.
This commit is contained in:
Akim Demaille
2021-01-17 08:17:50 +01:00
parent 5aaa93ae72
commit fb144c021c
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
examples/d/calc/calc.y
View File

@@ -115,10 +115,10 @@ if (isInputRange!R && is(ElementType!R : dchar))
// Skip initial spaces
while (!input.empty && input.front != '\n' && isWhite(input.front))
{
location.begin = location.end;
location.end.column++;
input.popFront;
}
location.step();
if (input.empty)
return Symbol(TokenKind.YYEOF, location);
@@ -126,8 +126,6 @@ if (isInputRange!R && is(ElementType!R : dchar))
// Numbers.
if (input.front.isNumber)
{
int ival;
int lenChars = 0;
import std.compiler : version_minor;
static if (version_minor >= 95)
{
@@ -136,29 +134,26 @@ if (isInputRange!R && is(ElementType!R : dchar))
import std.typecons : Flag, Yes;
import std.conv : parse;
auto parsed = parse!(int, R, Yes.doCount)(input);
ival = parsed.data;
lenChars = cast(int) parsed.count;
int ival = parsed.data;
location.end.column += cast(int) parsed.count;
}
else
{
auto copy = input;
import std.conv : parse;
ival = input.parse!int;
int ival = input.parse!int;
while (!input.empty && copy.front != input.front)
{
lenChars++;
location.end.column++;
copy.popFront;
}
}
location.begin = location.end;
location.end.column += lenChars;
return Symbol(TokenKind.NUM, ival, location);
}
// Individual characters
auto ch = input.front;
input.popFront;
location.begin = location.end;
location.end.column++;
switch (ch)
{