forked from jasder/antlr
Merge branch 'master' of https://github.com/antlr/antlr4 into py-input-mismatch-error
This commit is contained in:
commit
60cce436c2
|
@ -96,7 +96,7 @@ Now a fully functioning script might look like the following:
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
var input = "your text to parse here"
|
var input = "your text to parse here"
|
||||||
var chars = CharStreams.fromString(input);
|
var chars = new antlr4.InputStream(input);
|
||||||
var lexer = new MyGrammarLexer.MyGrammarLexer(chars);
|
var lexer = new MyGrammarLexer.MyGrammarLexer(chars);
|
||||||
var tokens = new antlr4.CommonTokenStream(lexer);
|
var tokens = new antlr4.CommonTokenStream(lexer);
|
||||||
var parser = new MyGrammarParser.MyGrammarParser(tokens);
|
var parser = new MyGrammarParser.MyGrammarParser(tokens);
|
||||||
|
|
|
@ -73,6 +73,29 @@ public class LexerExecDescriptors {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* regression test for antlr/antlr4#1925 */
|
||||||
|
public static class UnicodeCharSet extends BaseLexerTestDescriptor {
|
||||||
|
public String input = "均";
|
||||||
|
/**
|
||||||
|
[@0,0:0='均',<1>,1:0]
|
||||||
|
[@1,1:0='<EOF>',<-1>,1:1]
|
||||||
|
*/
|
||||||
|
@CommentHasStringValue
|
||||||
|
public String output;
|
||||||
|
|
||||||
|
public String errors = null;
|
||||||
|
public String startRule = "";
|
||||||
|
public String grammarName = "L";
|
||||||
|
|
||||||
|
/**
|
||||||
|
lexer grammar L;
|
||||||
|
ID : ([A-Z_]|'\u0100'..'\uFFFE') ([A-Z_0-9]|'\u0100'..'\uFFFE')*;
|
||||||
|
*/
|
||||||
|
@CommentHasStringValue
|
||||||
|
public String grammar;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
public static class CharSetInSet extends BaseLexerTestDescriptor {
|
public static class CharSetInSet extends BaseLexerTestDescriptor {
|
||||||
public String input = "a x";
|
public String input = "a x";
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -38,7 +38,7 @@ public class BasePython2Test extends BasePythonTest {
|
||||||
+ " lexer = <lexerName>(input, output)\n"
|
+ " lexer = <lexerName>(input, output)\n"
|
||||||
+ " stream = CommonTokenStream(lexer)\n"
|
+ " stream = CommonTokenStream(lexer)\n"
|
||||||
+ " stream.fill()\n"
|
+ " stream.fill()\n"
|
||||||
+ " [ print(t, file=output) for t in stream.tokens ]\n"
|
+ " [ print(unicode(t), file=output) for t in stream.tokens ]\n"
|
||||||
+ (showDFA ? " print(lexer._interp.decisionToDFA[Lexer.DEFAULT_MODE].toLexerString(), end='', file=output)\n"
|
+ (showDFA ? " print(lexer._interp.decisionToDFA[Lexer.DEFAULT_MODE].toLexerString(), end='', file=output)\n"
|
||||||
: "") + "\n" + "if __name__ == '__main__':\n"
|
: "") + "\n" + "if __name__ == '__main__':\n"
|
||||||
+ " main(sys.argv)\n" + "\n");
|
+ " main(sys.argv)\n" + "\n");
|
||||||
|
|
|
@ -51,7 +51,7 @@ This is just a quick start. The tool has many useful options to control generati
|
||||||
|
|
||||||
The Antlr 4 standard runtime for C# is now available from NuGet.
|
The Antlr 4 standard runtime for C# is now available from NuGet.
|
||||||
We trust that you know how to do add NuGet references to your project :-).
|
We trust that you know how to do add NuGet references to your project :-).
|
||||||
The package id is Antlr.4.Runtime. We do not support other packages.
|
The package id is Antlr4.Runtime.Standard. We do not support other packages.
|
||||||
|
|
||||||
|
|
||||||
### Step 6: You're done!
|
### Step 6: You're done!
|
||||||
|
|
|
@ -125,8 +125,10 @@ func (a *ATNDeserializer) reset(data []rune) {
|
||||||
// Don't adjust the first value since that's the version number
|
// Don't adjust the first value since that's the version number
|
||||||
if i == 0 {
|
if i == 0 {
|
||||||
temp[i] = c
|
temp[i] = c
|
||||||
} else {
|
} else if c > 1 {
|
||||||
temp[i] = c - 2
|
temp[i] = c - 2
|
||||||
|
} else {
|
||||||
|
temp[i] = c + 65533
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -138,7 +138,7 @@ ATNDeserializer.prototype.deserialize = function(data) {
|
||||||
ATNDeserializer.prototype.reset = function(data) {
|
ATNDeserializer.prototype.reset = function(data) {
|
||||||
var adjust = function(c) {
|
var adjust = function(c) {
|
||||||
var v = c.charCodeAt(0);
|
var v = c.charCodeAt(0);
|
||||||
return v>1 ? v-2 : -1;
|
return v>1 ? v-2 : v + 65533;
|
||||||
};
|
};
|
||||||
var temp = data.split("").map(adjust);
|
var temp = data.split("").map(adjust);
|
||||||
// don't adjust the first value since that's the version number
|
// don't adjust the first value since that's the version number
|
||||||
|
|
|
@ -86,7 +86,7 @@ class ATNDeserializer (object):
|
||||||
def reset(self, data):
|
def reset(self, data):
|
||||||
def adjust(c):
|
def adjust(c):
|
||||||
v = ord(c)
|
v = ord(c)
|
||||||
return v-2 if v>1 else -1
|
return v-2 if v>1 else v + 65533
|
||||||
temp = [ adjust(c) for c in data ]
|
temp = [ adjust(c) for c in data ]
|
||||||
# don't adjust the first value since that's the version number
|
# don't adjust the first value since that's the version number
|
||||||
temp[0] = ord(data[0])
|
temp[0] = ord(data[0])
|
||||||
|
|
|
@ -86,7 +86,7 @@ class ATNDeserializer (object):
|
||||||
def reset(self, data:str):
|
def reset(self, data:str):
|
||||||
def adjust(c):
|
def adjust(c):
|
||||||
v = ord(c)
|
v = ord(c)
|
||||||
return v-2 if v>1 else -1
|
return v-2 if v>1 else v + 65533
|
||||||
temp = [ adjust(c) for c in data ]
|
temp = [ adjust(c) for c in data ]
|
||||||
# don't adjust the first value since that's the version number
|
# don't adjust the first value since that's the version number
|
||||||
temp[0] = ord(data[0])
|
temp[0] = ord(data[0])
|
||||||
|
|
|
@ -1024,7 +1024,7 @@ ContextRuleListIndexedGetterDecl(r) ::= <<
|
||||||
|
|
||||||
>>
|
>>
|
||||||
|
|
||||||
LexerRuleContext() ::= "RuleContext"
|
LexerRuleContext() ::= "antlr4::RuleContext"
|
||||||
|
|
||||||
// The rule context name is the rule followed by a suffix; e.g. r becomes rContext.
|
// The rule context name is the rule followed by a suffix; e.g. r becomes rContext.
|
||||||
RuleContextNameSuffix() ::= "Context"
|
RuleContextNameSuffix() ::= "Context"
|
||||||
|
|
Loading…
Reference in New Issue