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

Jump to bottom

Add extra token for assembly assignment #6023

Merged

chriseth merged 1 commit into develop from assignment-whitespace-op

Feb 21, 2019

Contributor

Marenz commented Feb 18, 2019

Adding an extra token for := prevents whitespace between : = being valid

Fixes #4185

Marenz force-pushed the assignment-whitespace-op branch from ba90dbd to bc09196 Compare

February 18, 2019 14:08

chriseth reviewed

View reviewed changes

liblangutil/Token.h Outdated Show resolved Hide resolved

chriseth reviewed

View reviewed changes

libyul/AsmParser.cpp Outdated Show resolved Hide resolved

Marenz force-pushed the assignment-whitespace-op branch from bc09196 to a1012c6 Compare

February 18, 2019 15:14

codecov bot commented Feb 18, 2019 •

edited

Loading

Codecov Report

Merging #6023 into develop will decrease coverage by 0.04%.
The diff coverage is 94.54%.

@@             Coverage Diff             @@
##           develop    #6023      +/-   ##
===========================================
- Coverage    88.37%   88.33%   -0.05%     
===========================================
  Files          362      361       -1     
  Lines        34876    34877       +1     
  Branches      4136     4128       -8     
===========================================
- Hits         30823    30809      -14     
- Misses        2677     2694      +17     
+ Partials      1376     1374       -2

Flag	Coverage Δ
#all	`88.33% <94.54%> (-0.05%)`	⬇️
#syntax	`27.84% <45.45%> (+0.05%)`	⬆️

Marenz force-pushed the assignment-whitespace-op branch from a1012c6 to 280d9a4 Compare

February 18, 2019 17:32

Contributor Author

Marenz commented Feb 18, 2019

Updated

chriseth reviewed

View reviewed changes

liblangutil/Token.h Outdated Show resolved Hide resolved

chriseth reviewed

View reviewed changes

libyul/AsmParser.cpp Outdated Show resolved Hide resolved

Member

axic commented Feb 18, 2019

I think this needs a changelog entry.

axic reviewed

View reviewed changes

libyul/AsmParser.cpp Outdated Show resolved Hide resolved

Marenz force-pushed the assignment-whitespace-op branch from 280d9a4 to ae08796 Compare

February 19, 2019 09:20

Contributor Author

Marenz commented Feb 19, 2019

UpdateD

Marenz force-pushed the assignment-whitespace-op branch from ae08796 to 6b19c0a Compare

February 19, 2019 10:32

Contributor Author

Marenz commented Feb 19, 2019

Fixed failing test (forgot error msg update)

chriseth reviewed

View reviewed changes

libyul/AsmParser.cpp Outdated Show resolved Hide resolved

Marenz force-pushed the assignment-whitespace-op branch 2 times, most recently from 3ac6580 to f93f0e2 Compare

February 20, 2019 13:12

Contributor Author

Marenz commented Feb 20, 2019

Merged the switch cases
added back more detailed errors that existed before
added test cases

Contributor Author

Marenz commented Feb 20, 2019

I forgot something and I'll try to fix the coverage, too

Marenz force-pushed the assignment-whitespace-op branch from f93f0e2 to f493608 Compare

February 20, 2019 14:45

Contributor Author

Marenz commented Feb 20, 2019

Okay, good to go now.

chriseth reviewed

View reviewed changes

libyul/AsmParser.cpp Show resolved Hide resolved

chriseth reviewed

View reviewed changes

libyul/AsmParser.cpp Outdated Show resolved Hide resolved

Marenz force-pushed the assignment-whitespace-op branch from f493608 to 341e1b1 Compare

February 21, 2019 08:24

Contributor Author

Marenz commented Feb 21, 2019

Condensed the logic for the AssembylAssign / Comma syntax even more

axic requested changes

View reviewed changes

Member

axic left a comment

Please add a test into libsolidity/SolidityScanner.cpp

chriseth reviewed

View reviewed changes

libyul/AsmParser.cpp Outdated Show resolved Hide resolved


          Add extra token for assembly assignment

f395d5b

Adding an extra token for := prevents whitespace between : = being valid

Marenz force-pushed the assignment-whitespace-op branch from 341e1b1 to f395d5b Compare

February 21, 2019 12:58

Contributor Author

Marenz commented Feb 21, 2019

Rewrote to use while() instead of local function
added tests for scanner

chriseth approved these changes

View reviewed changes

chriseth merged commit 15d275e into develop

axic reviewed

View reviewed changes

test/libsolidity/SolidityScanner.cpp

+              BOOST_AUTO_TEST_CASE(assembly_multiple_assign)
+              {
+              	Scanner scanner(CharStream("let a, b, c := 1", ""));

Member

axic Feb 21, 2019

To be clear these supposed to test compounding similar characters and see if they are tokenised properly, such as:
::=, =:=, :=:=, etc.

axic deleted the assignment-whitespace-op branch

February 21, 2019 14:16

Xanewok mentioned this pull request

allow parsing ColonEqual as two separate tokens before 0.5.5 NomicFoundation/slang#852

Merged

github-merge-queue bot pushed a commit to NomicFoundation/slang that referenced this pull request


          allow parsing ColonEqual as two separate tokens before 0.5.5 (#852)

ca79eca

ethereum/solidity#6023

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet