diff options
| author | Patrick Li <pat@FreeBSD.org> | 2002-12-15 18:55:49 +0000 |
|---|---|---|
| committer | Patrick Li <pat@FreeBSD.org> | 2002-12-15 18:55:49 +0000 |
| commit | b6cbc598427f7ad959874044638d6101c4eecf53 (patch) | |
| tree | 5996053b3dfd4a20aa755582638237cd95735e6d /lang | |
| parent | Update to 2.3.5.4 to fix -segfault on -current and -stable (diff) | |
Fix patching
Submitted by: bento
Notes
Notes:
svn path=/head/; revision=71658
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/wxbasic/files/patch-wxbasic.y | 169 |
1 files changed, 80 insertions, 89 deletions
diff --git a/lang/wxbasic/files/patch-wxbasic.y b/lang/wxbasic/files/patch-wxbasic.y index ba4dd117eddb..fdf44d0fc6ec 100644 --- a/lang/wxbasic/files/patch-wxbasic.y +++ b/lang/wxbasic/files/patch-wxbasic.y @@ -1,97 +1,88 @@ ---- wxbasic.y.orig Mon Dec 2 11:47:30 2002 -+++ wxbasic.y Mon Dec 2 11:52:08 2002 +--- wxbasic.y.orig Sun Dec 15 13:17:34 2002 ++++ wxbasic.y Sun Dec 15 13:21:01 2002 @@ -378,7 +378,7 @@ - { $$ = wOpNode( W_OP_CLOSE, NULL, NULL ); } - - | W_TOKEN_CONST constList sep -- { $$ = $2 } -+ { $$ = $2; } - - | W_TOKEN_COMMON - { if (wCurrentScope != NULL) { + { $$ = wOpNode( W_OP_CLOSE, NULL, NULL ); }
+
+ | W_TOKEN_CONST constList sep
+- { $$ = $2 }
++ { $$ = $2; }
+
+ | W_TOKEN_COMMON
+ { if (wCurrentScope != NULL) {
@@ -397,7 +397,7 @@ - $$ = wOpNode( W_OP_CONTINUE, NULL, NULL ); } - - | W_TOKEN_DELETE expr sep -- { $$ = wOpNode( W_OP_DELETE, $2, NULL ) } -+ { $$ = wOpNode( W_OP_DELETE, $2, NULL ); } - - /* same as Dim Common */ - | W_TOKEN_DIM W_TOKEN_COMMON + $$ = wOpNode( W_OP_CONTINUE, NULL, NULL ); }
+
+ | W_TOKEN_DELETE expr sep
+- { $$ = wOpNode( W_OP_DELETE, $2, NULL ) }
++ { $$ = wOpNode( W_OP_DELETE, $2, NULL ); }
+
+ /* same as Dim Common */
+ | W_TOKEN_DIM W_TOKEN_COMMON
@@ -486,7 +486,7 @@ - wSymbolNode( W_OP_NOOP, $5, NULL, NULL ), $9 ); } - - | W_TOKEN_FOR W_TOKEN_EACH W_TOKEN_VARIABLE_NAME W_TOKEN_IN error -- { wExpected("an Array") }; -+ { wExpected("an Array"); } - - - | W_TOKEN_FOR W_TOKEN_EACH W_TOKEN_UNDEFINED W_TOKEN_IN W_TOKEN_ARRAY_NAME + wSymbolNode( W_OP_NOOP, $5, NULL, NULL ), $9 ); }
+
+ | W_TOKEN_FOR W_TOKEN_EACH W_TOKEN_VARIABLE_NAME W_TOKEN_IN error
+- { wExpected("an Array") };
++ { wExpected("an Array"); };
+
+
+ | W_TOKEN_FOR W_TOKEN_EACH W_TOKEN_UNDEFINED W_TOKEN_IN W_TOKEN_ARRAY_NAME
@@ -498,16 +498,16 @@ - wSymbolNode( W_OP_NOOP, $5, NULL, NULL ), $8 ); } - - | W_TOKEN_FOR W_TOKEN_EACH W_TOKEN_UNDEFINED W_TOKEN_IN error -- { wExpected("an Array") }; -+ { wExpected("an Array"); } - - | W_TOKEN_FOR W_TOKEN_EACH W_TOKEN_VARIABLE_NAME error -- { wExpected("In") }; -+ { wExpected("In"); } - - | W_TOKEN_FOR W_TOKEN_EACH W_TOKEN_UNDEFINED error -- { wExpected("In") }; -+ { wExpected("In"); } - - | W_TOKEN_FOR W_TOKEN_EACH error -- { wExpected("a variable") }; -+ { wExpected("a variable"); } - - /* For <var> = <expr> To <expr> [step <expr>] ... next */ - | W_TOKEN_FOR W_TOKEN_VARIABLE_NAME -@@ -529,7 +529,7 @@ - $$ = $4; } - - | W_TOKEN_FOR error -- { wExpected("Each or a variable") }; -+ { wExpected("Each or a variable"); } - - - | W_TOKEN_DECLARE W_TOKEN_FUNCTION W_TOKEN_UNDEFINED + wSymbolNode( W_OP_NOOP, $5, NULL, NULL ), $8 ); }
+
+ | W_TOKEN_FOR W_TOKEN_EACH W_TOKEN_UNDEFINED W_TOKEN_IN error
+- { wExpected("an Array") };
++ { wExpected("an Array"); };
+
+ | W_TOKEN_FOR W_TOKEN_EACH W_TOKEN_VARIABLE_NAME error
+- { wExpected("In") };
++ { wExpected("In"); };
+
+ | W_TOKEN_FOR W_TOKEN_EACH W_TOKEN_UNDEFINED error
+- { wExpected("In") };
++ { wExpected("In"); };
+
+ | W_TOKEN_FOR W_TOKEN_EACH error
+- { wExpected("a variable") };
++ { wExpected("a variable"); };
+
+ /* For <var> = <expr> To <expr> [step <expr>] ... next */
+ | W_TOKEN_FOR W_TOKEN_VARIABLE_NAME
@@ -1328,7 +1328,7 @@ - - printList: - ';' printList -- { $$ = $2 } -+ { $$ = $2; } - - | ',' printList - { $$ = wIntNode( W_OP_PRINT_VALUE, W_PRINT_TAB, NULL, $2 ); } +
+ printList:
+ ';' printList
+- { $$ = $2 }
++ { $$ = $2; }
+
+ | ',' printList
+ { $$ = wIntNode( W_OP_PRINT_VALUE, W_PRINT_TAB, NULL, $2 ); }
@@ -1519,7 +1519,7 @@ - { wIncrStack( wArgCountStack, 1 ); - if ($1->stackPos != wPeekStack(wArgCountStack) ) { - wFatal( W_SYNTAX, "Variable %s does not match declaration", $1->name); -- } }; -+ } } - - | W_TOKEN_VARIABLE_NAME ',' optSep - { wIncrStack( wArgCountStack, 1 ); + { wIncrStack( wArgCountStack, 1 );
+ if ($1->stackPos != wPeekStack(wArgCountStack) ) {
+ wFatal( W_SYNTAX, "Variable %s does not match declaration", $1->name);
+- } };
++ } }
+
+ | W_TOKEN_VARIABLE_NAME ',' optSep
+ { wIncrStack( wArgCountStack, 1 );
@@ -1558,7 +1558,7 @@ - | '.' '.' '.' ')' - { if (wCurrentScope->optArgs != W_MAX_OPT_ARGS) { - wFatal( W_SYNTAX, "... does not match declaration" ); -- } }; -+ } } - | error - { wFatal( W_SYNTAX, "Parm list does not match declaration" ); } - + | '.' '.' '.' ')'
+ { if (wCurrentScope->optArgs != W_MAX_OPT_ARGS) {
+ wFatal( W_SYNTAX, "... does not match declaration" );
+- } };
++ } }
+ | error
+ { wFatal( W_SYNTAX, "Parm list does not match declaration" ); }
+
@@ -1617,8 +1617,8 @@ - - fileHandle - : '#' expr -- { $$ = $2 } -+ { $$ = $2; } - | expr -- { $$ = $1 } -+ { $$ = $1; } - ; - +
+ fileHandle
+ : '#' expr
+- { $$ = $2 }
++ { $$ = $2; }
+ | expr
+- { $$ = $1 }
++ { $$ = $1; }
+ ;
+
|