Adding support of rational numbers to parser
parent
fa1c03bf73
commit
70a28abeab
|
@ -8,6 +8,14 @@ IN: lisp.parser.tests
|
||||||
"1234" "atom" \ lisp-expr rule parse parse-result-ast
|
"1234" "atom" \ lisp-expr rule parse parse-result-ast
|
||||||
] unit-test
|
] unit-test
|
||||||
|
|
||||||
|
{ -42 } [
|
||||||
|
"-42" "atom" \ lisp-expr rule parse parse-result-ast
|
||||||
|
] unit-test
|
||||||
|
|
||||||
|
{ 37/52 } [
|
||||||
|
"37/52" "atom" \ lisp-expr rule parse parse-result-ast
|
||||||
|
] unit-test
|
||||||
|
|
||||||
{ 123.98 } [
|
{ 123.98 } [
|
||||||
"123.98" "atom" \ lisp-expr rule parse parse-result-ast
|
"123.98" "atom" \ lisp-expr rule parse parse-result-ast
|
||||||
] unit-test
|
] unit-test
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
! Copyright (C) 2008 James Cash
|
! Copyright (C) 2008 James Cash
|
||||||
! See http://factorcode.org/license.txt for BSD license.
|
! See http://factorcode.org/license.txt for BSD license.
|
||||||
USING: kernel peg.ebnf peg.expr math.parser sequences arrays strings
|
USING: kernel peg.ebnf peg.expr math.parser sequences arrays strings
|
||||||
combinators.lib ;
|
combinators.lib math ;
|
||||||
|
|
||||||
IN: lisp.parser
|
IN: lisp.parser
|
||||||
|
|
||||||
|
@ -18,9 +18,11 @@ RPAREN = ")"
|
||||||
dquote = '"'
|
dquote = '"'
|
||||||
squote = "'"
|
squote = "'"
|
||||||
digit = [0-9]
|
digit = [0-9]
|
||||||
integer = (digit)+ => [[ string>number ]]
|
integer = ("-")? (digit)+ => [[ first2 append string>number ]]
|
||||||
float = (digit)+ "." (digit)* => [[ first3 >string [ >string ] dipd 3append string>number ]]
|
float = integer "." (digit)* => [[ first3 >string [ number>string ] dipd 3append string>number ]]
|
||||||
|
rational = integer "/" (digit)+ => [[ first3 nip string>number / ]]
|
||||||
number = float
|
number = float
|
||||||
|
| rational
|
||||||
| integer
|
| integer
|
||||||
id-specials = "!" | "$" | "%" | "&" | "*" | "/" | ":" | "<"
|
id-specials = "!" | "$" | "%" | "&" | "*" | "/" | ":" | "<"
|
||||||
| " =" | ">" | "?" | "^" | "_" | "~" | "+" | "-" | "." | "@"
|
| " =" | ">" | "?" | "^" | "_" | "~" | "+" | "-" | "." | "@"
|
||||||
|
|
Loading…
Reference in New Issue