Skip to content

Commit 27eb798

Browse files
committed
Use character classes for ID in the lexer
1 parent 1acce96 commit 27eb798

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

com.oracle.truffle.r.parser/src/com/oracle/truffle/r/parser/ParserGeneration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,6 @@ public class ParserGeneration {
105105
"allow 'function(...=NULL)', which has no effect, but also causes not error in GNU-R",
106106
"report tokens and other metadata to the code builder",
107107
"convert to ANTLR4",
108+
"use character classes instead of character sets in lexer"
108109
};
109110
}

com.oracle.truffle.r.parser/src/com/oracle/truffle/r/parser/R.g

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ fragment OP_NAME
954954
| ('*'|'/'|'+'|'-'|'>'|'<'|'='|'|'|'&'|':'|'^'|'.'|'~'|','|'?')
955955
;
956956

957-
fragment ID_NAME : ('a'..'z'|'A'..'Z'|'α'..'ω'|'Α'..'Ω'|'_') ('a'..'z'|'A'..'Z'|'0'..'9'|'α'..'ω'|'Α'..'Ω'|'_'|'.')* ;
957+
fragment ID_NAME : [\p{Alpha}_] [\p{Alnum}_.]* ;
958958

959959
fragment ESC_SEQ
960960
: '\\' ('b'|'t'|'n'|'f'|'r'|'"'|'\''|'`'|'\\'|' '|'a'|'v')

0 commit comments

Comments
 (0)