Join GitHub today
GitHub is home to over 31 million developers working together to host and review code, manage projects, and build software together.
Sign upFix grammar verifcation #34994
Conversation
rust-highfive
assigned
steveklabnik
Jul 23, 2016
This comment has been minimized.
This comment has been minimized.
|
I was able to fix the errors, yay Should we include the antlr4-complete.jar or just build the |
dns2utf8
changed the title
Enhance the spelling of the grammar
Fix grammar verifcation
Jul 23, 2016
dbrgn
reviewed
Jul 23, 2016
| @@ -4,11 +4,11 @@ Uses [antlr4](http://www.antlr.org/) and a custom Rust tool to compare | |||
| ASTs/token streams generated. You can use the `check-lexer` make target to | |||
| run all of the available tests. | |||
|
|
|||
| To use manually: | |||
| To use manually, assuming antler4 ist installed at `/usr/share/java/antlr-complete.jar`: | |||
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
I run the test result: failed. 4764 passed; 125 failed; 2 skippedI am curious, what are the next steps to fix the failed tests? |
dns2utf8
force-pushed the
dns2utf8:doc_grammar
branch
from
a1c65dc
to
a2f27ec
Jul 24, 2016
steveklabnik
reviewed
Jul 25, 2016
| @@ -37,7 +37,7 @@ $(BG): | |||
|
|
|||
| $(BG)RustLexer.class: $(BG) $(SG)RustLexer.g4 | |||
| $(Q)$(CFG_ANTLR4) -o $(BG) $(SG)RustLexer.g4 | |||
| $(Q)$(CFG_JAVAC) -d $(BG) $(BG)RustLexer.java | |||
| $(Q)$(CFG_JAVAC) -d $(BG) -classpath /usr/share/java/antlr-complete.jar $(BG)RustLexer.java | |||
This comment has been minimized.
This comment has been minimized.
steveklabnik
Jul 25, 2016
Member
hm, is this always going to be where this is? Feels system-specific
This comment has been minimized.
This comment has been minimized.
dns2utf8
Jul 28, 2016
Author
Contributor
It is the place in Arch Linux, but not on Mac OS X. I have not tested other distros.
This comment has been minimized.
This comment has been minimized.
|
@alexcrichton what do you think of this PR? |
This comment has been minimized.
This comment has been minimized.
|
It does seems system specific, perhaps that could be refactored? That being said I know very little about all of this, and we don't run it on the bots, so I don't mind merging basically whatever here. |
This comment has been minimized.
This comment has been minimized.
|
I'm cool with pushing these improvements through even with the hardcoded path. It's better than it was, and I'm glad somebody is looking at this stuff. Would be good to get this onto a bot #28592 |
This comment has been minimized.
This comment has been minimized.
|
The system specific path could be obmittet with an environement variable, so the Another alternative would be to include the jar file and just ship it. Is this a good idea? cc: @nikomatsakis |
dns2utf8
force-pushed the
dns2utf8:doc_grammar
branch
6 times, most recently
from
10f7384
to
e8f4f4f
Jul 28, 2016
This comment has been minimized.
This comment has been minimized.
|
I add the target I think this is a good state freeze/merge for now. I planed to add some documumentation about the process in the next weeks, but I am no sure whether it will be in a good shape before the 18. august or not. |
dns2utf8
force-pushed the
dns2utf8:doc_grammar
branch
from
e8f4f4f
to
76026d1
Jul 29, 2016
This comment has been minimized.
This comment has been minimized.
|
@bors: r+ rollup
|
This comment has been minimized.
This comment has been minimized.
|
|
jonathandturner
added a commit
to jonathandturner/rust
that referenced
this pull request
Aug 4, 2016
steveklabnik
added a commit
to steveklabnik/rust
that referenced
this pull request
Aug 4, 2016
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Aug 4, 2016
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Aug 4, 2016
bors
added a commit
that referenced
this pull request
Aug 4, 2016
jonathandturner
reviewed
Aug 4, 2016
| @@ -47,6 +47,10 @@ clean-misc: | |||
| $(Q)rm -Rf dist/* | |||
| $(Q)rm -Rf doc | |||
|
|
|||
| clean-grammar: | |||
| @$(call E, cleaning grammar verification) | |||
| $(Q)cd src/grammar && rm -Rf verify *.class *.java *.tokens | |||
This comment has been minimized.
This comment has been minimized.
jonathandturner
Aug 4, 2016
Contributor
This does not handle an out-of-tree build directory, which our bots use.
cleaning grammar verification
/bin/sh: 1: cd: can't cd to src/grammar
/buildslave/rust-buildbot/slave/auto-linux-64-nopt-t/build/mk/clean.mk:51: recipe for target 'clean-grammar' failed
make: *** [clean-grammar] Error 2
program finished with exit code 2
elapsedTime=0.958165
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
@bors r- |
dns2utf8
force-pushed the
dns2utf8:doc_grammar
branch
from
76026d1
to
4e9ea80
Aug 6, 2016
dns2utf8
force-pushed the
dns2utf8:doc_grammar
branch
from
4e9ea80
to
7ce7dd1
Aug 6, 2016
This comment has been minimized.
This comment has been minimized.
|
I moved the in-tree part to the README of the manual process, since it was just for convenience. I was looking for the structure of the build bot, can I run one locally? |
This comment has been minimized.
This comment has been minimized.
|
@alexcrichton ping re last comment here, can @dns2utf8 do something to test this out? |
This comment has been minimized.
This comment has been minimized.
|
We've got a number of docker images which our bots are running, so running the tests inside those containers would perhaps be enough to test out? |
This comment has been minimized.
This comment has been minimized.
|
I was able to start a container and access it with this command: docker run --rm -it --entrypoint=/bin/bash alexcrichton/rust-slave-linux:2016-08-04then inside clone my branch like the script: git clone https://github.com/dns2utf8/rust.git --branch doc_grammarI can then build my branch: cd rust
./configure && make -j$(nproc) docsbut I am not sure this is the same as you do. EDIT: I am doing this, because the |
This comment has been minimized.
This comment has been minimized.
|
@dns2utf8 yeah that's basically the same as what we do, this'd just be testing for presence of the relevant tools. Is this running by default on |
This comment has been minimized.
This comment has been minimized.
|
Closing due to inactivity, but feel free to resubmit with a rebase! |
alexcrichton
closed this
Sep 9, 2016
This comment has been minimized.
This comment has been minimized.
|
Thanks for the reminder, I rebased it. Can I reopen the issue just with a comment? |
dns2utf8 commentedJul 23, 2016
•
edited
I wanted to improve the grammar-section but I can not build it.
r? @steveklabnik @brson
EDIT: I resolved some of the issues, removed the compiler output from the entry.