enhanced-hooks-remove-parse-stuff.diff

   1 ---
   2
   3  source/parse.y |   14 ++++++--------
   4  1 files changed, 6 insertions(+), 8 deletions(-)
   5
   6 diff --quilt old/source/parse.y new/source/parse.y
   7 --- old/source/parse.y
   8 +++ new/source/parse.y
   9 @@ -106,11 +106,11 @@ block:      '{' blank stmts '}' blank
  10              | stmt
  11              ;
  12  stmts:      stmt
  13              | stmts stmt
  14              ;
  15 -stmt:       simpstmt seperator blank
  16 +stmt:       simpstmt '\n' blank
  17              | IF '(' cond ')' blank block %prec IF_NO_ELSE {
  18                  SET_BR_OFF($3, GetPC());
  19              }
  20              | IF '(' cond ')' blank block else blank block %prec ELSE {
  21                  SET_BR_OFF($3, ($7+1)); SET_BR_OFF($7, GetPC());
  22 @@ -132,26 +132,26 @@ stmt:       simpstmt seperator blank
  23                  blank block {
  24                      ADD_OP(OP_BRANCH); ADD_BR_OFF($5+2);
  25                      SET_BR_OFF($5+5, GetPC());
  26                      FillLoopAddrs(GetPC(), $5+2);
  27              }
  28 -            | BREAK seperator blank {
  29 +            | BREAK '\n' blank {
  30                  ADD_OP(OP_BRANCH); ADD_BR_OFF(0);
  31                  if (AddBreakAddr(GetPC()-1)) {
  32                      yyerror("break outside loop"); YYERROR;
  33                  }
  34              }
  35 -            | CONTINUE seperator blank {
  36 +            | CONTINUE '\n' blank {
  37                  ADD_OP(OP_BRANCH); ADD_BR_OFF(0);
  38                  if (AddContinueAddr(GetPC()-1)) {
  39                      yyerror("continue outside loop"); YYERROR;
  40                  }
  41              }
  42 -            | RETURN expr seperator blank {
  43 +            | RETURN expr '\n' blank {
  44                  ADD_OP(OP_RETURN);
  45              }
  46 -            | RETURN seperator blank {
  47 +            | RETURN '\n' blank {
  48                  ADD_OP(OP_RETURN_NO_VAL);
  49              }
  50              ;
  51  simpstmt:   SYMBOL '=' expr {
  52                  ADD_OP(OP_ASSIGN); ADD_SYM($1);
  53 @@ -434,19 +434,17 @@ and:    AND {
  54  or:     OR {
  55              ADD_OP(OP_DUP); ADD_OP(OP_BRANCH_TRUE); $$ = GetPC();
  56              ADD_BR_OFF(0);
  57          }
  58          ;
  59 -seperator:  '\n'
  60 -            | ';'
  61 -            ;
  62  blank:  /* nothing */
  63          | blank '\n'
  64          ;
  65
  66  %% /* User Subroutines Section */
  67
  68 +
  69  /*
  70  ** Parse a null terminated string and create a program from it (this is the
  71  ** parser entry point).  The program created by this routine can be
  72  ** executed using ExecuteProgram.  Returns program on success, or NULL
  73  ** on failure.  If the command failed, the error message is returned