summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-12-01 14:12:57 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-12-01 14:12:57 -0800
commit4f54c242eb83ab5bab39d6e83b074fbe0a88feee (patch)
tree8ceba7113e8767c63b6b7f509ec22320a93da888
parentd34388c1e8fad289a6198b127c6ae92c296d9246 (diff)
parent073419ed3f8b70456a6a09173e9baed791ec00d9 (diff)
downloadscala-4f54c242eb83ab5bab39d6e83b074fbe0a88feee.tar.gz
scala-4f54c242eb83ab5bab39d6e83b074fbe0a88feee.tar.bz2
scala-4f54c242eb83ab5bab39d6e83b074fbe0a88feee.zip
Merge pull request #4172 from advancedxy/spec-fix
add 0X... for hex number literal
-rw-r--r--spec/01-lexical-syntax.md2
-rw-r--r--spec/13-syntax-summary.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/01-lexical-syntax.md b/spec/01-lexical-syntax.md
index c37d8f2a0b..945dedf99b 100644
--- a/spec/01-lexical-syntax.md
+++ b/spec/01-lexical-syntax.md
@@ -326,7 +326,7 @@ Literal ::= [‘-’] integerLiteral
integerLiteral ::= (decimalNumeral | hexNumeral)
[‘L’ | ‘l’]
decimalNumeral ::= ‘0’ | nonZeroDigit {digit}
-hexNumeral ::= ‘0’ ‘x’ hexDigit {hexDigit}
+hexNumeral ::= ‘0’ (‘x’ | ‘X’) hexDigit {hexDigit}
digit ::= ‘0’ | nonZeroDigit
nonZeroDigit ::= ‘1’ | … | ‘9’
```
diff --git a/spec/13-syntax-summary.md b/spec/13-syntax-summary.md
index ae941f189e..2b9571cc73 100644
--- a/spec/13-syntax-summary.md
+++ b/spec/13-syntax-summary.md
@@ -41,7 +41,7 @@ idrest ::= {letter | digit} [‘_’ op]
integerLiteral ::= (decimalNumeral | hexNumeral) [‘L’ | ‘l’]
decimalNumeral ::= ‘0’ | nonZeroDigit {digit}
-hexNumeral ::= ‘0’ ‘x’ hexDigit {hexDigit}
+hexNumeral ::= ‘0’ (‘x’ | ‘X’) hexDigit {hexDigit}
digit ::= ‘0’ | nonZeroDigit
nonZeroDigit ::= ‘1’ | … | ‘9’