Add more integer notations for parsing #897
Conversation
compiler/src/lexer.mll
Outdated
| | ((*'-'?*) digit+) as s | ||
| {INT s} | ||
| | ((*'-'?*) digit+('_'digit+)*) as s | ||
| {INT Str.(global_replace (regexp "_") "" s)} |
There was a problem hiding this comment.
You need to keep the exact representation.
There was a problem hiding this comment.
Changed in last commit, the function that parse int_representation type delete the '_' before converting to Z.t
compiler/src/lexer.mll
Outdated
|
|
||
| | ('0' ['x' 'X'] hexdigit+) as s | ||
| | ('0' ['x' 'X' 'b' 'B' 'o' 'O'] hexdigit+) as s |
There was a problem hiding this comment.
Are we sure we want to accept 0babcd and 0o99 as valid literals?
There was a problem hiding this comment.
I corrected it in the last commit, I didn't saw the error at the time
compiler/src/lexer.mll
Outdated
| | ('0' ['b' 'B'] bindigit+('_'bindigit+)*) as s | ||
| {INT s} | ||
|
|
||
| | ('0' ['o' 'O'] octdigit+('_'octdigit+)*) as s |
There was a problem hiding this comment.
Why forbid consecutive underscores (as in 0xAA__BB)?
There was a problem hiding this comment.
There was no reasons. I just didn't though of it at time. It is possible now
compiler/src/syntax.ml
Outdated
| @@ -24,7 +24,9 @@ type castop1 = CSS of sowsize | CVS of svsize | |||
| type castop = castop1 L.located option | |||
|
|
|||
| type int_representation = string | |||
| let parse_int = Z.of_string | |||
| let parse_int (i:int_representation):Z.t = | |||
| let s = Str.(global_replace (regexp "_") "" i) in | |||
There was a problem hiding this comment.
Please don’t use Str. If you open Utils, the module String will contain replace_chars and filter.
There was a problem hiding this comment.
Corrected (I didn't knew it is necessary to open Utils to use filter)
CHANGELOG.md
Outdated
| @@ -31,6 +31,8 @@ | |||
| - Preserve formatting of integer literals in the lexer and when pretty-printing to LATEX | |||
| ([PR #886](https://github.com/jasmin-lang/jasmin/pull/886)). | |||
|
|
|||
| - Adding support for new integer notations similar to Ocaml and Rust langage integer | |||
| ([PR#897](https://github.com/jasmin-lang/jasmin/pull/897)). | |||
There was a problem hiding this comment.
Can you add more description: 0b.... 0o... 0x... and _.
compiler/src/lexer.mll
Outdated
| (* Why this is needed *) | ||
| | ((*'-'?*) digit+) as s | ||
| | ((*'-'?*) digit+(('_')+ digit+)*) as s |
There was a problem hiding this comment.
It might be worth removing this legacy comment.
vbgl
force-pushed
the
jasmin-integer-notation
branch
from
9086c47
to
9a3e4a8
Compare
At the source level, integer literal can now be written in - binary with a 0b or 0B prefix: 0b10001111 - octal with a 0o or 0O prefix: 0o7722 - decimal without any explicit prefix: 42 - hexadecimal with a 0x or 0X prefix: 0xabcd All these notations may contain underscores (except at the beginning), e.g., 0b1111_0000 or 10_854_736. Caveat _1234 is an indentifier, not a number. Co-authored-by: Vincent Laporte <Vincent.Laporte@inria.fr>
vbgl
force-pushed
the
jasmin-integer-notation
branch
from
9a3e4a8
to
fe90131
Compare
Issue
Parsing integer in Jasmin compiler are quite limited for the moment. We can easily add more syntaxes by only modifying a few lines in the lexer :
Changelog