Add support for do/while loops #768

roadriverrail · 2016-07-30T07:43:15Z

This commit adds support for a standard do while ;
form of statement. While loops were already being supported; supporting
a do/while loop mostly involves reusing code from while loops but putting
the conditional checking last.

This commit resolves issue #766

chriseth · 2016-08-01T09:54:51Z

Thanks for the pull request and your interest in the project! We have to think about whether introducing do-while-loops is something we want to be part of the language or if they are an unnecessary complication. If you want to work on features that have already been agreed by the community, please talk to a team member in https://gitter.im/ethereum/solidity

chriseth · 2016-10-28T15:04:20Z

Will change this to re-use the existing while loop ast node.

roadriverrail · 2016-10-28T15:14:19Z

Were you going to do that yourself in the next couple of days? I have a road trip coming up tomorrow, and I might have the free evening or two to do that.

chriseth · 2016-10-28T15:27:44Z

oh wow, even the better :-)
So the idea is to re-use the while loop ast node to reduce complexity and add a flag to it telling whether it is a do-while or a while-do-loop. It is important that this flag is also output for the two ast outputs.

roadriverrail · 2016-10-28T15:29:25Z

Yeah, as soon as I saw your comment, I figured that's what you had in mind. I haven't looked at solc since I wrote this (major life changes), but I assume you already have some sort of context variable that gets passed around that I could store the flag in. Most compilers do.

chriseth · 2016-10-28T16:22:20Z

At the point where the ast node is created in the parser, this flag should be stored inside the ast node as a regular class member.

roadriverrail · 2016-10-28T16:25:57Z

Got it. Makes perfect sense.

On Fri, Oct 28, 2016 at 9:22 AM chriseth [email protected] wrote:

At the point where the ast node is created in the parser, this flag should
be stored inside the ast node as a regular class member.

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#768 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AAlhYKDAV71YbpyEQneCcuqeKYuzUJ1qks5q4iFAgaJpZM4JYwLU
.

roadriverrail · 2016-11-07T00:47:11Z

Okay; this appears to be functionally comparable code without the extra class. Also, I saw that Why3 does not appear to support do-while, so I simulate a do-while loop for its output. I'm going to have to look at a rebase next, since the commit from main that this branch is based on has a broken "ast" and "ast-json" output.

chriseth · 2016-11-07T09:58:10Z

libsolidity/ast/AST.h

 		ASTPointer<Expression> const& _condition,
-		ASTPointer<Statement> const& _body
+		ASTPointer<Statement> const& _body,
+                bool _isDoWhile


Please use tabs for indentation.

chriseth · 2016-11-07T09:58:59Z

libsolidity/ast/ASTJsonConverter.cpp

 bool ASTJsonConverter::visit(WhileStatement const& _node)
 {
-	addJsonNode(_node, "WhileStatement", {}, true);
+	addJsonNode(_node,


Code style should be

addJsonNode( _node, _node.isDoWhile() ?..., true );

Sorry for the style break. Did I miss the style guide somewhere? Or do you follow a well-known one by convention?

chriseth · 2016-11-07T10:01:52Z

libsolidity/parsing/Parser.cpp

+	ASTPointer<Expression> condition = parseExpression();
+	expectToken(Token::RParen);
+        expectToken(Token::Semicolon);
+	nodeFactory.setEndPositionFromNode(body);


This should be replaced by a call to nodeFactory.setEndPosition() right before expecting the semicolon.

Fixed; that certainly explained some funny output I was seeing in the --asm dumps I normally use to confirm the results.

chriseth · 2016-11-08T09:54:18Z

libsolidity/ast/AST.h


 	Expression const& condition() const { return *m_condition; }
 	Statement const& body() const { return *m_body; }
+        bool isDoWhile() const { return m_isDoWhile; }


Here are still some spaces, probably in more places.

chriseth · 2016-11-08T17:07:19Z

Thanks! The last thing that is missing now is an entry into the changelog file and some mention of this feature in the documentation. I can also do that after merging this PR if you want.
Oh and it seems we have a conflict in grammar.txt :-(

roadriverrail · 2016-11-08T17:09:37Z

Yeah, I'll do the pickup merging on grammar.txt. I can get the changelog
and docs updated, too. Also, do you have some sort of testing framework I
should look into writing some tests for?

On Tue, Nov 8, 2016 at 9:07 AM chriseth [email protected] wrote:

Thanks! The last thing that is missing now is an entry into the changelog
file and some mention of this feature in the documentation. I can also do
that after merging this PR if you want.
Oh and it seems we have a conflict in grammar.txt :-(

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#768 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AAlhYDneCGvCORSA7Z8nWA7KHUeukOaxks5q8KxJgaJpZM4JYwLU
.

chriseth · 2016-11-08T17:13:50Z

Oh of course, totally forgot about tests. I think it is enough to add an end to end test, so take a look at the file SolidityEndToEndTest.cpp. You can probably copy an example there. Running the tests is a bit tricky, because you need an eth node. Start it with eth --test -d /tmp/test and then run soltest -- --ipcpath /tmp/test/geth.ipc (or just run scripts/test.sh).

roadriverrail · 2016-11-08T17:24:20Z

Since we're mostly done with the CR process, I squashed the commits, updated the Changelog, and added some mention of "do" to the docs, though documentation of the control structures is pretty light.

roadriverrail · 2016-11-08T21:15:54Z

Okay. I should be able to add a test. Tonight's a pretty tight schedule, but Wednesday or Thursday should be a little bit better.

chriseth · 2016-11-09T14:00:40Z

That's great, thanks!

roadriverrail · 2016-11-10T08:13:26Z

Okay. I added a basic unit test modeled on the while loop test. I see it runs the test repeatedly with different values of n and checks it against what you expect from C++, and that seems suitable enough. I could get fancier, I suppose, with nesting and all that jazz, if there's a need.

chriseth · 2016-11-10T11:11:53Z

test/libsolidity/SolidityEndToEndTest.cpp

+	{
+		u256 nfac = 1;
+		u256 i = 2;
+                do


Please don't use spaces for indentation.

chriseth · 2016-11-10T11:12:01Z

test/libsolidity/SolidityEndToEndTest.cpp

+                do
+		{
+			nfac *= i++;
+		} while (i <= n);


Please put the while on the next line.

This commit adds support for a standard do <statement> while <expr>; form of statement. While loops were already being supported; supporting a do/while loop mostly involves reusing code from while loops but putting the conditional checking last.

roadriverrail · 2016-11-10T15:08:37Z

Sincerely sorry about the style violations; I thought I checked every line for spaces last night, but it was late. Fixed.

chriseth · 2016-11-10T16:13:32Z

Wonderful, thanks a lot!

roadriverrail · 2016-11-10T18:59:36Z

Thanks for the patience in the review process. solc is pretty easy to work on, so I'm hoping this will not be the last time you'll be seeing a PR from me.

chriseth · 2016-11-10T22:49:47Z

That's great to hear! The issues marked as "soon" and/or "up-for-grabs" are probably the best to work on. If in doubt, ask on http://gitter.im/ethereum/solidity or contact me at [email protected]

roadriverrail · 2016-11-14T08:23:46Z

Fixes #766

chriseth added the in progress label Jul 30, 2016

roadriverrail mentioned this pull request Jul 30, 2016

Support do {} while(); control structure #766

Closed

chriseth suggested changes Nov 7, 2016

View reviewed changes

chriseth reviewed Nov 8, 2016

View reviewed changes

chriseth suggested changes Nov 10, 2016

View reviewed changes

Add support for do/while loops

4524ad0

This commit adds support for a standard do <statement> while <expr>; form of statement. While loops were already being supported; supporting a do/while loop mostly involves reusing code from while loops but putting the conditional checking last.

chriseth approved these changes Nov 10, 2016

View reviewed changes

chriseth merged commit a40dcfe into argotorg:develop Nov 10, 2016

chriseth removed the in progress label Nov 10, 2016

axic pushed a commit to ipsilon/solidity that referenced this pull request Apr 22, 2025

🥢 Nit comments (argotorg#768)

dc09481

Add support for do/while loops #768

Add support for do/while loops #768

Uh oh!

Conversation

roadriverrail commented Jul 30, 2016

Uh oh!

chriseth commented Aug 1, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chriseth commented Oct 28, 2016

Uh oh!

roadriverrail commented Oct 28, 2016

Uh oh!

chriseth commented Oct 28, 2016

Uh oh!

roadriverrail commented Oct 28, 2016

Uh oh!

chriseth commented Oct 28, 2016

Uh oh!

roadriverrail commented Oct 28, 2016

Uh oh!

roadriverrail commented Nov 7, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

chriseth commented Nov 8, 2016

Uh oh!

roadriverrail commented Nov 8, 2016

Uh oh!

chriseth commented Nov 8, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

roadriverrail commented Nov 8, 2016

Uh oh!

roadriverrail commented Nov 8, 2016

Uh oh!

chriseth commented Nov 9, 2016

Uh oh!

roadriverrail commented Nov 10, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

roadriverrail commented Nov 10, 2016

Uh oh!

chriseth commented Nov 10, 2016

Uh oh!

roadriverrail commented Nov 10, 2016

Uh oh!

chriseth commented Nov 10, 2016

Uh oh!

roadriverrail commented Nov 14, 2016

Uh oh!

Uh oh!

chriseth commented Aug 1, 2016 •

edited

Loading

chriseth commented Nov 8, 2016 •

edited

Loading