Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle equals and allow typing texts in cells #91

Merged
merged 12 commits into from
Jul 23, 2020
Merged

Handle equals and allow typing texts in cells #91

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d2b1e71
Handle equals
ryonakano Jul 5, 2020
16134fb
Less diff
ryonakano Jul 5, 2020
4e75a8e
Initial work to parse text
ryonakano Jul 11, 2020
e43f42c
Use typeof instead of having a custom property
ryonakano Jul 11, 2020
8674694
Suggested changes
ryonakano Jul 12, 2020
c1e17d4
Suggested changes
ryonakano Jul 13, 2020
05ea775
Parse formulas with no equals as a plain text
ryonakano Jul 18, 2020
108c4da
Suggested change
ryonakano Jul 22, 2020
4715da8
Consistency with other spreadsheet apps
ryonakano Jul 22, 2020
255f8ff
Pass string instead of Regex; DRY
ryonakano Jul 22, 2020
c0f7ab7
Coding style
ryonakano Jul 22, 2020
ab3b7dd
Precise regex
ryonakano Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions src/Services/Formula/FormulaParser.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ public class Spreadsheet.Services.Formula.FormulaParser : Parsing.Parser {
last = parse_expression ();
if (current.kind == delimiter) {
break;
} else {
expect ("semi-colon");
}
}

Expand Down Expand Up @@ -53,11 +51,8 @@ public class Spreadsheet.Services.Formula.FormulaParser : Parsing.Parser {
}
} else if (current.kind == "number") {
return parse_number ();
} else if (current.kind == "text") {
return parse_text ();
} else {
unexpected ();
return new NumberExpression (0.0);
return parse_text ();
}
}

Expand Down Expand Up @@ -147,9 +142,18 @@ public class Spreadsheet.Services.Formula.FormulaParser : Parsing.Parser {
}

private TextExpression parse_text () throws ParserError {
TextExpression res = new TextExpression (current.lexeme);
expect ("text");
return res;
string val = "";

while (true) {
ryonakano marked this conversation as resolved.
Show resolved Hide resolved
if (current.kind == "eof") {
break;
}

val += current.lexeme;
eat ();
}

return new TextExpression (val);
}

private CellReference parse_cell_name () throws ParserError {
Expand Down