Changeset 27407 in project

Timestamp:

09/11/12 04:25:03 (7 years ago)

Author:

Alan Post

Message:

jbogenturfa'i: added new ldcmz tests, fix code generation so they pass.

I'm still working out the top-level code for all the lower-level
terminals that pass into it, making sure that the variety of valid
parse trees produced consistent results.

File:

• release/4/jbogenturfahi/trunk/samselpla.scm (modified) (4 diffs)

release/4/jbogenturfahi/trunk/samselpla.scm

@@ -785 +785 @@
 ;; ?-null handles + and *.
 ;;
-(define (paragraphs paragraph NIhO-clause+ free* su-clause* paragraphs)
+(define (paragraphs paragraph NIhO-clause+ free* su-clause* paragraphs-0)
   `(paragraphs
     ,@paragraph
@@ -791 +791 @@
     ,@(?*-null free*)
     ,@(?*-null su-clause*)
-    ,@(?*-null paragraphs)))
+    ,@(?*-null paragraphs-0)))
 
 (define (paragraph statement-or-fragment I-clause*)
   (define (I I-clause free* statement-or-fragment?)
-    `(,@I-clause ,@(*-null free*) ,@(?-null statement-or-fragment?)))
+    ;
+    ; statement-or-fragment? uses ?*-null, rather than ?-null,
+    ; because an extra list is created in |statement|.  This
+    ; normalizes it to the same list structure everywhere it
+    ; is used.
+    ;
+    `(,@I-clause ,@(*-null free*) ,@(?*-null statement-or-fragment?)))
 
   `((paragraph ,@statement-or-fragment ,@(map-apply I I-clause*))))
@@ -817 +823 @@
                      BO-clause?
                      free*
-                     #!optional (statement-2? ""))
+                     statement-2?)
   `(,@statement-3
     ,@(?-null I-clause?)
@@ -1263 +1269 @@
   `(,@NOI-clause
     ,@(*-null free-0*)
-    ,@subsentence
+    ,subsentence
     ,@(?-null KUhO-clause?)
     ,@(*-null free-1*)))