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

Jump to bottom

make ANTLR3 produce Reproducible output #209

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

make ANTLR3 produce Reproducible output #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1fe929
drop non-reproducible timestamp in generated sources
hboutemy Aug 8, 2022
75e5e87
ensure reproducible elements order by sorting
hboutemy Aug 8, 2022
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
2 changes: 2 additions & 0 deletions tool/src/main/antlr3/org/antlr/grammar/v3/CodeGenTreeWalker.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import org.antlr.codegen.*;
import java.util.HashSet;
import java.util.Set;
import java.util.Collection;
import java.util.Collections;
import org.antlr.runtime.BitSet;
import org.antlr.runtime.DFA;
import org.stringtemplate.v4.ST;
Expand Down Expand Up @@ -284,6 +285,7 @@ protected final List<String> getTokenTypesAsTargetLabels(Collection<GrammarAST>
}
labels.add( label );
}
Collections.sort(labels); // ensure reproducible order
return labels;
}

Expand Down
2 changes: 1 addition & 1 deletion tool/src/main/resources/org/antlr/codegen/templates/ActionScript/ActionScript.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ outputFile(LEXER,PARSER,TREE_PARSER, actionScope, actions,
fileName, ANTLRVersion, generatedTimestamp, trace,
scopes, superClass, literals) ::=
<<
// $ANTLR <ANTLRVersion> <fileName> <generatedTimestamp>
// $ANTLR <ANTLRVersion> <fileName>
package<if(actions.(actionScope).package)> <actions.(actionScope).package><endif> {
<actions.(actionScope).header>
<@imports>
Expand Down
1 change: 0 additions & 1 deletion tool/src/main/resources/org/antlr/codegen/templates/C/C.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ leadIn(type) ::=
* This <type> file was generated by $ANTLR version <ANTLRVersion>
*
* - From the grammar source file : <fileName>
* - On : <generatedTimestamp>
<if(LEXER)>
* - for the lexer : <name>Lexer
<endif>
Expand Down
2 changes: 1 addition & 1 deletion tool/src/main/resources/org/antlr/codegen/templates/CSharp2/CSharp2.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ outputFile( LEXER,PARSER,TREE_PARSER, actionScope, actions,
// \</auto-generated>
//------------------------------------------------------------------------------

// $ANTLR <ANTLRVersion> <fileName> <generatedTimestamp>
// $ANTLR <ANTLRVersion> <fileName>

<if(trace)>
#define ANTLR_TRACE
Expand Down
2 changes: 1 addition & 1 deletion tool/src/main/resources/org/antlr/codegen/templates/CSharp3/CSharp3.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ outputFile( LEXER,PARSER,TREE_PARSER, actionScope, actions,
// \</auto-generated>
//------------------------------------------------------------------------------

// $ANTLR <ANTLRVersion> <fileName> <generatedTimestamp>
// $ANTLR <ANTLRVersion> <fileName>

// The variable 'variable' is assigned but its value is never used.
#pragma warning disable 219
Expand Down
1 change: 0 additions & 1 deletion tool/src/main/resources/org/antlr/codegen/templates/Cpp/Cpp.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ leadIn(type) ::=
* This <type> file was generated by $ANTLR version <ANTLRVersion>
*
* - From the grammar source file : <fileName>
* - On : <generatedTimestamp>
<if(LEXER)>
* - for the lexer : <name>Lexer
<endif>
Expand Down
2 changes: 1 addition & 1 deletion tool/src/main/resources/org/antlr/codegen/templates/Delphi/Delphi.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ unit <name>;

{$HINTS OFF}

// $ANTLR <ANTLRVersion> <fileName> <generatedTimestamp>
// $ANTLR <ANTLRVersion> <fileName>

<actions.(actionScope).header>

Expand Down
2 changes: 1 addition & 1 deletion tool/src/main/resources/org/antlr/codegen/templates/Java/Java.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ outputFile(LEXER,PARSER,TREE_PARSER, actionScope, actions,
fileName, ANTLRVersion, generatedTimestamp, trace,
scopes, superClass, literals) ::=
<<
// $ANTLR <ANTLRVersion> <fileName> <generatedTimestamp>
// $ANTLR <ANTLRVersion> <fileName>
<actions.(actionScope).header>

<@imports>
Expand Down
2 changes: 1 addition & 1 deletion tool/src/main/resources/org/antlr/codegen/templates/JavaScript/JavaScript.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ outputFile(LEXER,PARSER,TREE_PARSER, actionScope, actions,
fileName, ANTLRVersion, generatedTimestamp, trace,
scopes, superClass, literals) ::=
<<
// $ANTLR <ANTLRVersion> <fileName> <generatedTimestamp>
// $ANTLR <ANTLRVersion> <fileName>
<actions.(actionScope).header>

<@imports>
Expand Down
5 changes: 2 additions & 3 deletions tool/src/main/resources/org/antlr/codegen/templates/ObjC/ObjC.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ leadIn(type) ::=
* This <type> file was generated by $ANTLR version <ANTLRVersion>
*
* - From the grammar source file : <fileName>
* - On : <generatedTimestamp>
<if(LEXER)>
* - for the lexer : <name>Lexer
<endif>
Expand Down Expand Up @@ -120,7 +119,7 @@ outputFile( LEXER,
<<
<leadIn("OBJC source")>
*/
// $ANTLR <ANTLRVersion> <fileName> <generatedTimestamp>
// $ANTLR <ANTLRVersion> <fileName>

<! <if(actions.(actionScope).header)>
/* =============================================================================
Expand Down Expand Up @@ -190,7 +189,7 @@ headerFile( LEXER,
literals
) ::=
<<
// $ANTLR <ANTLRVersion> <fileName> <generatedTimestamp>
// $ANTLR <ANTLRVersion> <fileName>

<@imports>
<actions.(actionScope).preincludes>
Expand Down
2 changes: 1 addition & 1 deletion tool/src/main/resources/org/antlr/codegen/templates/Perl5/Perl5.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ outputFile(LEXER,PARSER,TREE_PARSER, actionScope, actions,
fileName, ANTLRVersion, generatedTimestamp, trace,
scopes, superClass, literals) ::=
<<
# $ANTLR <ANTLRVersion> <fileName> <generatedTimestamp>
# $ANTLR <ANTLRVersion> <fileName>
<actions.(actionScope).header>

<@imports>
Expand Down
2 changes: 1 addition & 1 deletion tool/src/main/resources/org/antlr/codegen/templates/Python/Python.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ outputFile(LEXER,PARSER,TREE_PARSER, actionScope, actions,
fileName, ANTLRVersion, generatedTimestamp, trace,
scopes, superClass, literals) ::=
<<
# $ANTLR <ANTLRVersion> <fileName> <generatedTimestamp>
# $ANTLR <ANTLRVersion> <fileName>

<@imports>
import sys
Expand Down
2 changes: 1 addition & 1 deletion tool/src/main/resources/org/antlr/codegen/templates/Python3/Python3.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ outputFile(LEXER,PARSER,TREE_PARSER, actionScope, actions,
fileName, ANTLRVersion, generatedTimestamp, trace,
scopes, superClass, literals) ::=
<<
# $ANTLR <ANTLRVersion> <fileName> <generatedTimestamp>
# $ANTLR <ANTLRVersion> <fileName>

<@imports>
import sys
Expand Down
1 change: 0 additions & 1 deletion tool/src/main/resources/org/antlr/codegen/templates/Ruby/Ruby.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ outputFile(LEXER, PARSER, TREE_PARSER, actionScope, actions, docComment, recogni
# Generated using ANTLR version: <ANTLRVersion>
# Ruby runtime library version: <runtimeLibraryVersion()>
# Input grammar file: <fileName>
# Generated at: <generatedTimestamp>
#

# ~~~\> start load path setup
Expand Down
2 changes: 1 addition & 1 deletion tool/src/main/resources/org/antlr/codegen/templates/Scala/Scala.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ outputFile(LEXER,PARSER,TREE_PARSER, actionScope, actions,
fileName, ANTLRVersion, generatedTimestamp, trace,
scopes, superClass, literals) ::=
<<
// $ANTLR <ANTLRVersion> <fileName> <generatedTimestamp>
// $ANTLR <ANTLRVersion> <fileName>
<actions.(actionScope).header>

<@imports>
Expand Down