Correction to array printing and Advanced grammar

svn: r7406
This commit is contained in:
Kathy Gray 2007-09-24 19:11:48 +00:00
parent 31fb91c9bd
commit 22c89205df
2 changed files with 6 additions and 5 deletions

View File

@ -91,7 +91,7 @@
(this "his" "tis" "ths" "thi" "tihs" "thsi")
(instanceof "instancef" "instanceo" "intsanceof")
(if "fi")
(else "lse" "ese" "els" "eles")
(else "lse" "ese" "els" "eles" "elseif")
(return "eturn" "rturn" "reurn" "retrn" "retun" "retur" "reutrn" "retrun" "returns" "raturn")
(true "rue" "tue" "tre" "tru" "ture" "treu")
(false "flse" "fase" "fale" "fals" "flase" "fasle")
@ -101,6 +101,7 @@
"mplements" "iplements" "impements" "implments" "impleents" "implemnts" "implemets" "implemens"
"implement")
(void "oid" "vid" "voi" "viod")
(for "fo" "fore" "fro")
(super "uper" "sper" "supr" "supe" "supper")
(public "ublic" "pblic" "pulic" "pubic" "publc" "publi" "pubilc")
(private "rivate" "pivate" "prvate" "priate" "privte" "privae" "privat" "pravite")
@ -940,7 +941,7 @@
(define (statement-c interact?)
(if interact?
(choose ((return-s #t)
(if-s #t (eta statement))
(if-s statement #t)
(block #t)
(for-l (choose ((variable-declaration (array-type (value+name-type prim-type)) expression #t #f "for loop variable")
(comma-sep stmt-expr "initializations")) "for loop initialization")
@ -958,7 +959,7 @@
assignment-ops)
) "statement")
(choose ((return-s #t)
(if-s #t (eta statement))
(if-s statement #t)
(variable-declaration (array-type (value+name-type prim-type))
(choose (expression array-init) "variable initialization") #t #t "local variable")
(block #t)

View File

@ -105,10 +105,10 @@
(make-partial-string
(lambda (idx first-test second-test)
(cond
((first-test idx) "")
((first-test idx) (list ""))
((second-test idx)
(append (internal-format (send value access idx) full-print? style already-printed nl? nt)
(list (make-partial-string (add1 idx) first-test second-test))))
(make-partial-string (add1 idx) first-test second-test)))
(else
(append (internal-format (send value access idx) full-print? style already-printed nl? nt)
(if nl? (list "\n") (list " "))