gnustep/libs-steptalk
0
0
Fork 0
mirror of https://github.com/gnustep/libs-steptalk.git synced 2025-02-21 02:31:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

*** empty log message ***

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/steptalk/trunk@13655 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Stefan Urbanek 2002-05-14 23:42:25 +00:00
parent c2c2d22254
commit 1f669adb4b
7 changed files with 83 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GNUmakefile
View file

@ -28,6 +28,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
include Version include Version
PACKAGE_NAME = StepTalk PACKAGE_NAME = StepTalk
CVS_MODULE_NAME = StepTalk
SUBPROJECTS = \ SUBPROJECTS = \
Source \ Source \
@ -35,7 +36,6 @@ SUBPROJECTS = \
Modules \ Modules \
Tools Tools
-include GNUMakefile.preamble -include GNUMakefile.preamble
include $(GNUSTEP_MAKEFILES)/aggregate.make include $(GNUSTEP_MAKEFILES)/aggregate.make
include $(GNUSTEP_MAKEFILES)/Master/source-distribution.make include $(GNUSTEP_MAKEFILES)/Master/source-distribution.make

5
Languages/Smalltalk/ChangeLog
View file

@ -1,3 +1,8 @@
2002 May 15
* STCompiler, Externs, STGrammar: fixed undefined exceptions (reported by
Björn Gohla <b.gohla@gmx.de>)
2002 Mar 17 2002 Mar 17
* STCompiler, STGrammar: changed grammar to be able to have "methods" or * STCompiler, STGrammar: changed grammar to be able to have "methods" or

1
Languages/Smalltalk/Externs.h
View file

@ -11,5 +11,6 @@
extern NSString *STCompilerSyntaxException; extern NSString *STCompilerSyntaxException;
extern NSString *STCompilerGenericException; extern NSString *STCompilerGenericException;
extern NSString *STCompilerInconsistencyException;
extern NSString *STInterpreterGenericException; extern NSString *STInterpreterGenericException;

1
Languages/Smalltalk/Externs.m
View file

@ -11,5 +11,6 @@
NSString *STCompilerSyntaxException = @"STCompilerSyntaxException"; NSString *STCompilerSyntaxException = @"STCompilerSyntaxException";
NSString *STCompilerGenericException = @"STCompilerGenericException"; NSString *STCompilerGenericException = @"STCompilerGenericException";
NSString *STCompilerInconsistencyException =@"STCompilerInconsistencyException";
NSString *STInterpreterGenericException = @"STInterpreterGenericException"; NSString *STInterpreterGenericException = @"STInterpreterGenericException";

1
Languages/Smalltalk/STCompiler.m
View file

@ -31,6 +31,7 @@
#import "STCompiledMethod.h" #import "STCompiledMethod.h"
#import "STCompilerUtils.h" #import "STCompilerUtils.h"
#import "STSourceReader.h" #import "STSourceReader.h"
#import "Externs.h"
#import <StepTalk/STExterns.h> #import <StepTalk/STExterns.h>
#import <StepTalk/STObjectReference.h> #import <StepTalk/STObjectReference.h>

145
Languages/Smalltalk/STGrammar.m
View file

@ -43,6 +43,7 @@
#import "STCompiler.h" #import "STCompiler.h"
#import "STCompilerUtils.h" #import "STCompilerUtils.h"
#import "STSourceReader.h" #import "STSourceReader.h"
#import "Externs.h"
#import <StepTalk/STExterns.h> #import <StepTalk/STExterns.h>
@ -150,14 +151,14 @@ static const short yyrhs[] = { -1,
#if YYDEBUG != 0 #if YYDEBUG != 0
static const short yyrline[] = { 0, static const short yyrline[] = { 0,
66, 71, 75, 81, 86, 94, 101, 101, 104, 108, 67, 72, 76, 82, 87, 95, 102, 102, 105, 109,
114, 119, 127, 133, 138, 141, 146, 153, 157, 162, 115, 120, 128, 134, 139, 142, 147, 154, 158, 163,
169, 173, 177, 183, 188, 194, 200, 206, 211, 219, 170, 174, 178, 184, 189, 195, 201, 207, 212, 220,
225, 231, 236, 242, 243, 248, 249, 255, 260, 267, 226, 232, 237, 243, 244, 249, 250, 256, 261, 268,
270, 276, 281, 287, 292, 297, 300, 301, 302, 304, 271, 277, 282, 288, 293, 298, 301, 302, 303, 305,
313, 322, 328, 333, 339, 340, 342, 343, 345, 349, 314, 323, 329, 334, 340, 341, 343, 344, 346, 350,
353, 357, 362, 364, 366, 368, 370, 372, 374, 376, 354, 358, 363, 365, 367, 369, 371, 373, 375, 377,
378, 381, 383, 385, 386, 388, 390, 392 379, 382, 384, 386, 387, 389, 391, 393
}; };
#endif #endif
@ -302,7 +303,7 @@ static const short yycheck[] = { 1,
#line 3 "/usr/local/share/bison.simple" #line 3 "/usr/local/share/bison.simple"
/* Skeleton output parser for bison, /* Skeleton output parser for bison,
Copyright (c) 2002 Free Software Foundation Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -798,26 +799,26 @@ yyreduce:
switch (yyn) { switch (yyn) {
case 1: case 1:
#line 66 "STGrammar.y" #line 67 "STGrammar.y"
{ {
[COMPILER compileMethod:nil]; [COMPILER compileMethod:nil];
; ;
break;} break;}
case 2: case 2:
#line 71 "STGrammar.y" #line 72 "STGrammar.y"
{ {
[COMPILER compileMethod:yyvsp[0]]; [COMPILER compileMethod:yyvsp[0]];
; ;
break;} break;}
case 4: case 4:
#line 82 "STGrammar.y" #line 83 "STGrammar.y"
{ {
yyval = [STCMethod methodWithPattern:nil yyval = [STCMethod methodWithPattern:nil
/**/ statements:yyvsp[0]]; /**/ statements:yyvsp[0]];
; ;
break;} break;}
case 5: case 5:
#line 87 "STGrammar.y" #line 88 "STGrammar.y"
{ {
[yyvsp[0] setTemporaries:yyvsp[-1]]; [yyvsp[0] setTemporaries:yyvsp[-1]];
yyval = [STCMethod methodWithPattern:nil yyval = [STCMethod methodWithPattern:nil
@ -825,32 +826,32 @@ case 5:
; ;
break;} break;}
case 6: case 6:
#line 96 "STGrammar.y" #line 97 "STGrammar.y"
{ {
[COMPILER setReceiverVariables:yyvsp[0]]; [COMPILER setReceiverVariables:yyvsp[0]];
; ;
break;} break;}
case 9: case 9:
#line 105 "STGrammar.y" #line 106 "STGrammar.y"
{ {
[COMPILER compileMethod:yyvsp[0]]; [COMPILER compileMethod:yyvsp[0]];
; ;
break;} break;}
case 10: case 10:
#line 109 "STGrammar.y" #line 110 "STGrammar.y"
{ {
[COMPILER compileMethod:yyvsp[0]]; [COMPILER compileMethod:yyvsp[0]];
; ;
break;} break;}
case 11: case 11:
#line 115 "STGrammar.y" #line 116 "STGrammar.y"
{ {
yyval = [STCMethod methodWithPattern:yyvsp[-1] yyval = [STCMethod methodWithPattern:yyvsp[-1]
/**/ statements:yyvsp[0]]; /**/ statements:yyvsp[0]];
; ;
break;} break;}
case 12: case 12:
#line 120 "STGrammar.y" #line 121 "STGrammar.y"
{ {
[yyvsp[0] setTemporaries:yyvsp[-1]]; [yyvsp[0] setTemporaries:yyvsp[-1]];
yyval = [STCMethod methodWithPattern:yyvsp[-2] yyval = [STCMethod methodWithPattern:yyvsp[-2]
@ -858,107 +859,107 @@ case 12:
; ;
break;} break;}
case 13: case 13:
#line 129 "STGrammar.y" #line 130 "STGrammar.y"
{ {
yyval = [STCMessage message]; yyval = [STCMessage message];
[yyval addKeyword:yyvsp[0] object:nil]; [yyval addKeyword:yyvsp[0] object:nil];
; ;
break;} break;}
case 14: case 14:
#line 134 "STGrammar.y" #line 135 "STGrammar.y"
{ {
yyval = [STCMessage message]; yyval = [STCMessage message];
[yyval addKeyword:yyvsp[-1] object:yyvsp[0]]; [yyval addKeyword:yyvsp[-1] object:yyvsp[0]];
; ;
break;} break;}
case 16: case 16:
#line 142 "STGrammar.y" #line 143 "STGrammar.y"
{ {
yyval = [STCMessage message]; yyval = [STCMessage message];
[yyval addKeyword:yyvsp[-1] object:yyvsp[0]]; [yyval addKeyword:yyvsp[-1] object:yyvsp[0]];
; ;
break;} break;}
case 17: case 17:
#line 147 "STGrammar.y" #line 148 "STGrammar.y"
{ {
[yyvsp[-2] addKeyword:yyvsp[-1] object:yyvsp[0]]; [yyvsp[-2] addKeyword:yyvsp[-1] object:yyvsp[0]];
yyval = yyvsp[-2]; yyval = yyvsp[-2];
; ;
break;} break;}
case 18: case 18:
#line 154 "STGrammar.y" #line 155 "STGrammar.y"
{ yyval = yyvsp[-1]; ; { yyval = yyvsp[-1]; ;
break;} break;}
case 19: case 19:
#line 158 "STGrammar.y" #line 159 "STGrammar.y"
{ {
yyval = [NSMutableArray array]; yyval = [NSMutableArray array];
[yyval addObject:yyvsp[0]]; [yyval addObject:yyvsp[0]];
; ;
break;} break;}
case 20: case 20:
#line 163 "STGrammar.y" #line 164 "STGrammar.y"
{ {
yyval = yyvsp[-1]; yyval = yyvsp[-1];
[yyval addObject:yyvsp[0]]; [yyval addObject:yyvsp[0]];
; ;
break;} break;}
case 21: case 21:
#line 170 "STGrammar.y" #line 171 "STGrammar.y"
{ {
yyval = [STCStatements statements]; yyval = [STCStatements statements];
; ;
break;} break;}
case 22: case 22:
#line 174 "STGrammar.y" #line 175 "STGrammar.y"
{ {
yyval = yyvsp[-1]; yyval = yyvsp[-1];
; ;
break;} break;}
case 23: case 23:
#line 178 "STGrammar.y" #line 179 "STGrammar.y"
{ {
yyval = yyvsp[-1]; yyval = yyvsp[-1];
[yyval setTemporaries:yyvsp[-3]]; [yyval setTemporaries:yyvsp[-3]];
; ;
break;} break;}
case 24: case 24:
#line 184 "STGrammar.y" #line 185 "STGrammar.y"
{ {
yyval = [NSMutableArray array]; yyval = [NSMutableArray array];
[yyval addObject:yyvsp[0]]; [yyval addObject:yyvsp[0]];
; ;
break;} break;}
case 25: case 25:
#line 189 "STGrammar.y" #line 190 "STGrammar.y"
{ {
yyval = yyvsp[-2]; yyval = yyvsp[-2];
[yyval addObject:yyvsp[0]]; [yyval addObject:yyvsp[0]];
; ;
break;} break;}
case 26: case 26:
#line 196 "STGrammar.y" #line 197 "STGrammar.y"
{ {
yyval = [STCStatements statements]; yyval = [STCStatements statements];
[yyval setReturnExpression:yyvsp[0]]; [yyval setReturnExpression:yyvsp[0]];
; ;
break;} break;}
case 27: case 27:
#line 201 "STGrammar.y" #line 202 "STGrammar.y"
{ {
yyval = [STCStatements statements]; yyval = [STCStatements statements];
[yyval setExpressions:yyvsp[0]]; [yyval setExpressions:yyvsp[0]];
; ;
break;} break;}
case 28: case 28:
#line 207 "STGrammar.y" #line 208 "STGrammar.y"
{ {
yyval = [STCStatements statements]; yyval = [STCStatements statements];
[yyval setExpressions:yyvsp[-1]]; [yyval setExpressions:yyvsp[-1]];
; ;
break;} break;}
case 29: case 29:
#line 212 "STGrammar.y" #line 213 "STGrammar.y"
{ {
yyval = [STCStatements statements]; yyval = [STCStatements statements];
[yyval setReturnExpression:yyvsp[0]]; [yyval setReturnExpression:yyvsp[0]];
@ -966,28 +967,28 @@ case 29:
; ;
break;} break;}
case 30: case 30:
#line 220 "STGrammar.y" #line 221 "STGrammar.y"
{ {
yyval = [NSMutableArray array]; yyval = [NSMutableArray array];
[yyval addObject:yyvsp[0]]; [yyval addObject:yyvsp[0]];
; ;
break;} break;}
case 31: case 31:
#line 226 "STGrammar.y" #line 227 "STGrammar.y"
{ {
yyval = yyvsp[-2]; yyval = yyvsp[-2];
[yyval addObject:yyvsp[0]]; [yyval addObject:yyvsp[0]];
; ;
break;} break;}
case 32: case 32:
#line 232 "STGrammar.y" #line 233 "STGrammar.y"
{ {
yyval = [STCExpression yyval = [STCExpression
/**/ primaryExpressionWithObject:yyvsp[0]]; /**/ primaryExpressionWithObject:yyvsp[0]];
; ;
break;} break;}
case 33: case 33:
#line 237 "STGrammar.y" #line 238 "STGrammar.y"
{ {
yyval = [STCExpression yyval = [STCExpression
/**/ primaryExpressionWithObject:yyvsp[0]]; /**/ primaryExpressionWithObject:yyvsp[0]];
@ -995,74 +996,74 @@ case 33:
; ;
break;} break;}
case 35: case 35:
#line 244 "STGrammar.y" #line 245 "STGrammar.y"
{ {
yyval = yyvsp[0]; yyval = yyvsp[0];
[yyval setAssignments:yyvsp[-1]]; [yyval setAssignments:yyvsp[-1]];
; ;
break;} break;}
case 37: case 37:
#line 250 "STGrammar.y" #line 251 "STGrammar.y"
{ {
yyval = yyvsp[0]; yyval = yyvsp[0];
[yyval setAssignments:yyvsp[-1]]; [yyval setAssignments:yyvsp[-1]];
; ;
break;} break;}
case 38: case 38:
#line 256 "STGrammar.y" #line 257 "STGrammar.y"
{ {
yyval = [NSMutableArray array]; yyval = [NSMutableArray array];
[yyval addObject:yyvsp[0]]; [yyval addObject:yyvsp[0]];
; ;
break;} break;}
case 39: case 39:
#line 261 "STGrammar.y" #line 262 "STGrammar.y"
{ {
yyval = yyvsp[-1]; yyval = yyvsp[-1];
[yyval addObject:yyvsp[0]]; [yyval addObject:yyvsp[0]];
; ;
break;} break;}
case 40: case 40:
#line 268 "STGrammar.y" #line 269 "STGrammar.y"
{ yyval = yyvsp[-1];; { yyval = yyvsp[-1];;
break;} break;}
case 41: case 41:
#line 271 "STGrammar.y" #line 272 "STGrammar.y"
{ {
/* FIXME: check if this is this OK */ /* FIXME: check if this is this OK */
[yyval setCascade:yyvsp[0]]; [yyval setCascade:yyvsp[0]];
; ;
break;} break;}
case 42: case 42:
#line 277 "STGrammar.y" #line 278 "STGrammar.y"
{ {
yyval = [NSMutableArray array]; yyval = [NSMutableArray array];
[yyval addObject:yyvsp[0]]; [yyval addObject:yyvsp[0]];
; ;
break;} break;}
case 43: case 43:
#line 282 "STGrammar.y" #line 283 "STGrammar.y"
{ {
yyval = yyvsp[-2]; yyval = yyvsp[-2];
[yyval addObject:yyvsp[0]]; [yyval addObject:yyvsp[0]];
; ;
break;} break;}
case 44: case 44:
#line 288 "STGrammar.y" #line 289 "STGrammar.y"
{ {
yyval = [STCMessage message]; yyval = [STCMessage message];
[yyval addKeyword:yyvsp[0] object:nil]; [yyval addKeyword:yyvsp[0] object:nil];
; ;
break;} break;}
case 45: case 45:
#line 293 "STGrammar.y" #line 294 "STGrammar.y"
{ {
yyval = [STCMessage message]; yyval = [STCMessage message];
[yyval addKeyword:yyvsp[-1] object:yyvsp[0]]; [yyval addKeyword:yyvsp[-1] object:yyvsp[0]];
; ;
break;} break;}
case 50: case 50:
#line 305 "STGrammar.y" #line 306 "STGrammar.y"
{ {
STCMessage *message = [STCMessage message]; STCMessage *message = [STCMessage message];
[message addKeyword:yyvsp[0] object:nil]; [message addKeyword:yyvsp[0] object:nil];
@ -1072,7 +1073,7 @@ case 50:
; ;
break;} break;}
case 51: case 51:
#line 314 "STGrammar.y" #line 315 "STGrammar.y"
{ {
STCMessage *message = [STCMessage message]; STCMessage *message = [STCMessage message];
[message addKeyword:yyvsp[-1] object:yyvsp[0]]; [message addKeyword:yyvsp[-1] object:yyvsp[0]];
@ -1082,7 +1083,7 @@ case 51:
; ;
break;} break;}
case 52: case 52:
#line 323 "STGrammar.y" #line 324 "STGrammar.y"
{ {
yyval = [STCExpression yyval = [STCExpression
/**/ messageExpressionWithTarget:yyvsp[-1] /**/ messageExpressionWithTarget:yyvsp[-1]
@ -1090,91 +1091,91 @@ case 52:
; ;
break;} break;}
case 53: case 53:
#line 329 "STGrammar.y" #line 330 "STGrammar.y"
{ {
yyval = [STCMessage message]; yyval = [STCMessage message];
[yyval addKeyword:yyvsp[-1] object:yyvsp[0]]; [yyval addKeyword:yyvsp[-1] object:yyvsp[0]];
; ;
break;} break;}
case 54: case 54:
#line 334 "STGrammar.y" #line 335 "STGrammar.y"
{ {
yyval = yyvsp[-2]; yyval = yyvsp[-2];
[yyval addKeyword:yyvsp[-1] object:yyvsp[0]]; [yyval addKeyword:yyvsp[-1] object:yyvsp[0]];
; ;
break;} break;}
case 59: case 59:
#line 346 "STGrammar.y" #line 347 "STGrammar.y"
{ {
yyval = [STCPrimary primaryWithVariable:yyvsp[0]]; yyval = [STCPrimary primaryWithVariable:yyvsp[0]];
; ;
break;} break;}
case 60: case 60:
#line 350 "STGrammar.y" #line 351 "STGrammar.y"
{ {
yyval = [STCPrimary primaryWithLiteral:yyvsp[0]]; yyval = [STCPrimary primaryWithLiteral:yyvsp[0]];
; ;
break;} break;}
case 61: case 61:
#line 354 "STGrammar.y" #line 355 "STGrammar.y"
{ {
yyval = [STCPrimary primaryWithBlock:yyvsp[0]]; yyval = [STCPrimary primaryWithBlock:yyvsp[0]];
; ;
break;} break;}
case 62: case 62:
#line 358 "STGrammar.y" #line 359 "STGrammar.y"
{ {
yyval = [STCPrimary primaryWithExpression:yyvsp[-1]]; yyval = [STCPrimary primaryWithExpression:yyvsp[-1]];
; ;
break;} break;}
case 67: case 67:
#line 371 "STGrammar.y" #line 372 "STGrammar.y"
{ yyval = [COMPILER createNumberLiteralFrom:yyvsp[0]]; ; { yyval = [COMPILER createNumberLiteralFrom:yyvsp[0]]; ;
break;} break;}
case 68: case 68:
#line 373 "STGrammar.y" #line 374 "STGrammar.y"
{ yyval = [COMPILER createSymbolLiteralFrom:yyvsp[0]]; ; { yyval = [COMPILER createSymbolLiteralFrom:yyvsp[0]]; ;
break;} break;}
case 69: case 69:
#line 375 "STGrammar.y" #line 376 "STGrammar.y"
{ yyval = [COMPILER createStringLiteralFrom:yyvsp[0]]; ; { yyval = [COMPILER createStringLiteralFrom:yyvsp[0]]; ;
break;} break;}
case 70: case 70:
#line 377 "STGrammar.y" #line 378 "STGrammar.y"
{ yyval = [COMPILER createCharacterLiteralFrom:yyvsp[0]]; ; { yyval = [COMPILER createCharacterLiteralFrom:yyvsp[0]]; ;
break;} break;}
case 71: case 71:
#line 379 "STGrammar.y" #line 380 "STGrammar.y"
{ yyval = [COMPILER createArrayLiteralFrom:yyvsp[-1]]; ; { yyval = [COMPILER createArrayLiteralFrom:yyvsp[-1]]; ;
break;} break;}
case 72: case 72:
#line 381 "STGrammar.y" #line 382 "STGrammar.y"
{ yyval = [NSMutableArray array]; { yyval = [NSMutableArray array];
[yyval addObject:yyvsp[0]]; ; [yyval addObject:yyvsp[0]]; ;
break;} break;}
case 73: case 73:
#line 383 "STGrammar.y" #line 384 "STGrammar.y"
{ yyval = [NSMutableArray array]; { yyval = [NSMutableArray array];
[yyval addObject:yyvsp[0]]; ; [yyval addObject:yyvsp[0]]; ;
break;} break;}
case 74: case 74:
#line 385 "STGrammar.y"
{ yyval = yyvsp[-1]; [yyval addObject:yyvsp[0]]; ;
break;}
case 75:
#line 386 "STGrammar.y" #line 386 "STGrammar.y"
{ yyval = yyvsp[-1]; [yyval addObject:yyvsp[0]]; ;
break;}
case 75:
#line 387 "STGrammar.y"
{ yyval = yyvsp[-1]; [yyval addObject:yyvsp[0]]; ; { yyval = yyvsp[-1]; [yyval addObject:yyvsp[0]]; ;
break;} break;}
case 76: case 76:
#line 389 "STGrammar.y" #line 390 "STGrammar.y"
{ yyval = [COMPILER createSymbolLiteralFrom:yyvsp[0]]; ; { yyval = [COMPILER createSymbolLiteralFrom:yyvsp[0]]; ;
break;} break;}
case 77: case 77:
#line 391 "STGrammar.y" #line 392 "STGrammar.y"
{ yyval = [COMPILER createSymbolLiteralFrom:yyvsp[0]]; ; { yyval = [COMPILER createSymbolLiteralFrom:yyvsp[0]]; ;
break;} break;}
case 78: case 78:
#line 393 "STGrammar.y" #line 394 "STGrammar.y"
{ yyval = [COMPILER createSymbolLiteralFrom:yyvsp[0]]; ; { yyval = [COMPILER createSymbolLiteralFrom:yyvsp[0]]; ;
break;} break;}
} }
@ -1375,7 +1376,7 @@ yyerrhandle:
yystate = yyn; yystate = yyn;
goto yynewstate; goto yynewstate;
} }
#line 395 "STGrammar.y" #line 396 "STGrammar.y"
int STCerror(const char *str) int STCerror(const char *str)

1
Languages/Smalltalk/STGrammar.y
View file

@ -32,6 +32,7 @@
#import "STCompiler.h" #import "STCompiler.h"
#import "STCompilerUtils.h" #import "STCompilerUtils.h"
#import "STSourceReader.h" #import "STSourceReader.h"
#import "Externs.h"
#import <StepTalk/STExterns.h> #import <StepTalk/STExterns.h>