Changeset 27407 in project


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • release/4/jbogenturfahi/trunk/samselpla.scm

    r27406 r27407  
    785785;; ?-null handles + and *.
    786786;;
    787 (define (paragraphs paragraph NIhO-clause+ free* su-clause* paragraphs)
     787(define (paragraphs paragraph NIhO-clause+ free* su-clause* paragraphs-0)
    788788  `(paragraphs
    789789    ,@paragraph
     
    791791    ,@(?*-null free*)
    792792    ,@(?*-null su-clause*)
    793     ,@(?*-null paragraphs)))
     793    ,@(?*-null paragraphs-0)))
    794794
    795795(define (paragraph statement-or-fragment I-clause*)
    796796  (define (I I-clause free* statement-or-fragment?)
    797     `(,@I-clause ,@(*-null free*) ,@(?-null statement-or-fragment?)))
     797    ;
     798    ; statement-or-fragment? uses ?*-null, rather than ?-null,
     799    ; because an extra list is created in |statement|.  This
     800    ; normalizes it to the same list structure everywhere it
     801    ; is used.
     802    ;
     803    `(,@I-clause ,@(*-null free*) ,@(?*-null statement-or-fragment?)))
    798804
    799805  `((paragraph ,@statement-or-fragment ,@(map-apply I I-clause*))))
     
    817823                     BO-clause?
    818824                     free*
    819                      #!optional (statement-2? ""))
     825                     statement-2?)
    820826  `(,@statement-3
    821827    ,@(?-null I-clause?)
     
    12631269  `(,@NOI-clause
    12641270    ,@(*-null free-0*)
    1265     ,@subsentence
     1271    ,subsentence
    12661272    ,@(?-null KUhO-clause?)
    12671273    ,@(*-null free-1*)))
Note: See TracChangeset for help on using the changeset viewer.