From e3d4bed0fefcdcd909d74e391c2816175248f2ca Mon Sep 17 00:00:00 2001 From: Kathy Gray Date: Wed, 19 Sep 2007 16:21:50 +0000 Subject: [PATCH] Correction to grammar for advanced; correction to source position tracking for repeat-greedy: both correct bug #8940 svn: r7384 --- collects/combinator-parser/private-combinator/combinator.scm | 2 +- collects/profj/comb-parsers/parser-units.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/collects/combinator-parser/private-combinator/combinator.scm b/collects/combinator-parser/private-combinator/combinator.scm index eba059541d..d1ab06f361 100644 --- a/collects/combinator-parser/private-combinator/combinator.scm +++ b/collects/combinator-parser/private-combinator/combinator.scm @@ -540,7 +540,7 @@ (make-repeat-res (make-res (append a (res-a r)) (res-rest r) repeat-name #f (+ (res-used curr-ans) (res-used r)) - #f (res-first-tok curr-ans)) + #f (res-first-tok r)) (repeat-res-stop rest-ans))] [else (error 'parser-internal-error9 (format "~a" r))]))]) diff --git a/collects/profj/comb-parsers/parser-units.scm b/collects/profj/comb-parsers/parser-units.scm index d9f7d6313a..3eaccbb79f 100644 --- a/collects/profj/comb-parsers/parser-units.scm +++ b/collects/profj/comb-parsers/parser-units.scm @@ -995,8 +995,8 @@ (interface-def #f (sequence (tok:extends (comma-sep IDENTIFIER "interfaces")) id "extends") - (repeat-greedy (choose (method-sig-no-abs - (make-field (global-mods access-mods) (value+name-type prim-type) expression #t)) + (repeat-greedy (choose ((sequence (method-sig-no-abs SEMI_COLON) id "method header") + (make-field (global-mods access-mods) (value+name-type prim-type) expression #t)) "interface member definition")))) (define class