Miroirs/waforth
1
0
Fork 0
mirror of https://github.com/remko/waforth synced 2024-12-27 09:59:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support BASE in number parser.

Browse source 
Resolves #7
This commit is contained in:
Remko Tronçon 2018-06-03 19:56:09 +02:00
parent 328f362982
commit 8097b7575c
2 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/waforth.wat
View file

@ -1307,6 +1307,7 @@ EOF
(local $base i32)
(local $p i32)
(local $end i32)
(local $n i32)
(if (i32.eqz (tee_local $length (i32.load (i32.const !wordBase))))
(return (i32.const -1)))
@ -1320,19 +1321,29 @@ EOF
(i32.const 0x2d #| '-' |#))
(then
(set_local $sign (i32.const -1))
(set_local $char (i32.const 48)))
(else (set_local $sign (i32.const 1))))
(set_local $char (i32.const 48 #| '0' |# )))
(else
(set_local $sign (i32.const 1))))
;; Read all characters
(set_local $value (i32.const 0))
(block $endLoop
(loop $loop
(if (i32.or (i32.lt_s (get_local $char) (i32.const 48 #| '0' |# ))
(i32.gt_s (get_local $char) (i32.const 57 #| '9' |# )))
(then (return (i32.const -1))))
(if (i32.lt_s (get_local $char) (i32.const 48 #| '0' |# ))
(return (i32.const -1)))
(if (i32.le_s (get_local $char) (i32.const 57 #| '9' |# ))
(then
(set_local $n (i32.sub (get_local $char) (i32.const 48))))
(else
(if (i32.lt_s (get_local $char) (i32.const 65 #| 'A' |# ))
(return (i32.const -1)))
(set_local $n (i32.sub (get_local $char) (i32.const 55)))
(if (i32.ge_s (get_local $n) (get_local $base))
(return (i32.const -1)))))
(set_local $value (i32.add (i32.mul (get_local $value) (get_local $base))
(i32.sub (get_local $char)
(i32.const 48))))
(get_local $n)))
(set_local $p (i32.add (get_local $p) (i32.const 1)))
(br_if $endLoop (i32.eq (get_local $p) (get_local $end)))
(set_local $char (i32.load8_s (get_local $p)))

9
tests/index.js
View file

@ -170,6 +170,15 @@ describe("WAForth", () => {
expect(core.interpret()).to.eql(0);
expect(stack[0]).to.eql(-123);
});
it("should interpret a hex", () => {
forth.read("16 BASE ! DF");
expect(core.interpret()).to.eql(0);
expect(stack[0]).to.eql(223);
});
it("should not interpret hex in decimal mode", () => {
forth.read("DF");
expect(core.interpret()).to.eql(-1);
});
it("should fail on half a word", () => {
forth.read("23FOO");