@@ -883,7 +883,7 @@ distribution. ;; output is either the keyword 'pass', the keyword 'fail' or an AST. The AST ;; specifies the structure of the expected tree, the names of the nodes and ;; the individual characters. If you don't want to specify the whole tree, - ;; just use the wild-card symbol '*.' for the portion of the tree you want to + ;; just use the wild-card symbol '*' for the portion of the tree you want to ;; skip. "" ; <- This is the input @@ -896,18 +896,18 @@ distribution. fail ; <- The keyword 'fail' "A <- 'a' B <- 'b'" - (Grammar (Definition (Identifier #\A) *.) ; <- Here we skip some of - (Definition (Identifier #\B) *.)) ; Definition's children + (Grammar (Definition (Identifier #\A) *) ; <- Here we skip some of + (Definition (Identifier #\B) *)) ; Definition's children "A <- 'a'" - (Grammar (*.)) ; <- Here we specify a child tree of any type + (Grammar (*)) ; <- Here we specify a child tree of any type "A <- [a-z] *[a-z0-9]" - (Grammar (Definition (Identifier #\A) (LeftArrow) (Alternation *.))) + (Grammar (Definition (Identifier #\A) (LeftArrow) (Alternation *))) "A <- 'a'" (Grammar (Definition (Identifier #\A) - (LeftArrow) (Alternation (Sequence (Unit (Literal #\a)))))) + (LeftArrow) (Alternation (Sequence (Unit (Literal (LChar #\a))))))) ) ------------------------------------------------------------------------------- docs/book/book @@ -89,7 +89,7 @@ mzscheme (cond ((and (ast? result) (list? expect)) (let ((type (car expect)) (child (cdr expect))) - (or (equal? type '*.) + (or (equal? type '*) (and (equal? (ast-t result) type) (children-match? (ast-c result) child))))) ((and (char? result) (char? expect) (char=? result expect))) (else #f))) @@ -97,9 +97,9 @@ mzscheme (define (children-match? res expect) (if (null? res) - (or (null? expect) (equal? (car expect) '*.)) + (or (null? expect) (equal? (car expect) '*)) (and (not (null? expect)) - (or (equal? (car expect) '*.) + (or (equal? (car expect) '*) (and (is-expected? (car res) (car expect)) (children-match? (cdr res) (cdr expect))))))) src/waxeye/tester.scm @@ -29,11 +29,11 @@ System.out.println(${(get-expr)}); } " - (template (string *.) (code *.) (string *.) (code *.) (string *.)) + (template (string *) (code *) (string *) (code *) (string *)) "def ${(get-name)}(${(get-args)}):${(i)} ${(get-code)}${(u)}" - (template (string *.) (code *.) (string *.) (code *.) (string *.) (code *.) (string *.) (code *.) (code *.)) + (template (string *) (code *) (string *) (code *) (string *) (code *) (string *) (code *) (code *)) ) (code test/grammars/templ.scm @@ -28,7 +28,7 @@ ;; output is either the keyword 'pass', the keyword 'fail' or an AST. The AST ;; specifies the structure of the expected tree, the names of the nodes and ;; the individual characters. If you don't want to specify the whole tree, - ;; just use the wild-card symbol '*.' for the portion of the tree you want to + ;; just use the wild-card symbol '*' for the portion of the tree you want to ;; skip. "" ; <- This is the input @@ -41,14 +41,14 @@ fail ; <- The keyword 'fail' "A <- 'a' B <- 'b'" - (Grammar (Definition (Identifier #\A) *.) ; <- Here we skip some of - (Definition (Identifier #\B) *.)) ; Definition's children + (Grammar (Definition (Identifier #\A) *) ; <- Here we skip some of + (Definition (Identifier #\B) *)) ; Definition's children "A <- 'a'" - (Grammar (*.)) ; <- Here we specify a child tree of any type + (Grammar (*)) ; <- Here we specify a child tree of any type "A <- [a-z] *[a-z0-9]" - (Grammar (Definition (Identifier #\A) (LeftArrow) (Alternation *.))) + (Grammar (Definition (Identifier #\A) (LeftArrow) (Alternation *))) "A <- 'a'" (Grammar (Definition (Identifier #\A) test/grammars/waxeye.scm 2c86bd9e71e8f70b2f6c638fa583f1894e0a0360 Orlando D. A. R. Hill orlandodarhill http://github.com/orlandodarhill/waxeye/commit/395a0e2e42496ff40b98c204935e2c15e4f51bcc 395a0e2e42496ff40b98c204935e2c15e4f51bcc 2008-11-10T11:08:49-08:00 2008-11-10T11:08:49-08:00 Changed '*.' symbol in grammar tester to just '*' 381ad924cd4dc0ee690da5a82c4d4bdf7809b52f Orlando D. A. R. Hill orlandodarhill