diff options
| author | Drahflow <drahflow@gmx.de> | 2014-01-12 00:04:44 +0100 |
|---|---|---|
| committer | Drahflow <drahflow@gmx.de> | 2014-01-12 00:04:44 +0100 |
| commit | dfa26a0f9ddb6d16e10af158df4d8b86acf6dbe5 (patch) | |
| tree | a86a36759152c3f7cd7da5144693c38b4a227a69 | |
| parent | 2df9c01eb9b223efc5b7d1b263ee807f22ec119b (diff) | |
Correct order of subgroup matches
| -rw-r--r-- | compiler/elymasTokenize.ey | 2 | ||||
| -rw-r--r-- | compiler/standardClient.ey | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/compiler/elymasTokenize.ey b/compiler/elymasTokenize.ey index 2be43bf..df3c1ed 100644 --- a/compiler/elymasTokenize.ey +++ b/compiler/elymasTokenize.ey @@ -10,7 +10,7 @@ { "^ +(.*)" regex } { } parse { "^#" regex } { "" } parse { "^(\\d+) +(.*)" regex } { TOKINT token -01 } parse - { "^(\\d[0-9.]*([eE]-?\\d+)?) +(.*)" regex } { -01 TOKFLOAT token -02 } parse + { "^(\\d[0-9.]*([eE]-?\\d+)?) +(.*)" regex } { TOKFLOAT token -02 } parse { "^\"(.*)" regex } { "" /str defv { _ "^\"(.*)" regex { -01 -- 0 } { 1 } ? * } { diff --git a/compiler/standardClient.ey b/compiler/standardClient.ey index 9cbc82b..9854654 100644 --- a/compiler/standardClient.ey +++ b/compiler/standardClient.ey @@ -141,8 +141,9 @@ empty ==?a [ { ^( } { - tail parse currentCapture capture =a + currentCapture ==thisCapture currentCapture 1 add =currentCapture + tail parse thisCapture capture =a ^) not { ") expected" die } rep tail } { ^[ } { @@ -1085,7 +1086,7 @@ { .value base10decode } /TOKINT defvd { .value "^(\\d+)(\\.(\\d*))?([eE](-)?(\\d+))?$" regex not { "Not in fact a float" die } rep - ==m1 ==m2 -- ==eS ==e -- + ==m1 -- ==m2 -- ==eS ==e 0 FLOAT ==m1f m1 { zero sub m1f 10 FLOAT mul add =m1f } each |