Update of /cvsroot/nice/Nice/src/bossa/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8798/F:/nice/src/bossa/parser
Modified Files:
Parser.jj
Log Message:
Converted NiceClass, DefaultConstructor and Nice field classes to nice code.
Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.271
retrieving revision 1.272
diff -C2 -d -r1.271 -r1.272
*** Parser.jj 14 Oct 2004 15:42:10 -0000 1.271
--- Parser.jj 5 Nov 2004 14:57:57 -0000 1.272
***************
*** 966,970 ****
}
! List getField(NiceClass c, List fields, List overrides, boolean storeDocString):
{
MonoSymbol field;
--- 966,970 ----
}
! void getField(CNiceClass c, boolean storeDocString):
{
MonoSymbol field;
***************
*** 998,1006 ****
{
if (isOverride)
! overrides.add(c.makeOverride(field, value));
else
! fields.add(c.makeField(field, value, isFinal, isTransient, isVolatile, docString));
!
! return overrides;
}
}
--- 998,1004 ----
{
if (isOverride)
! c.addOverride(field, value);
else
! c.addField(field, value, isFinal, isTransient, isVolatile, docString);
}
}
***************
*** 1051,1072 ****
(
"{"
! { NiceClass impl = new NiceClass(res); }
// internal fields and methods
- { List fields = new LinkedList(), overrides = new LinkedList(),
- methods = new ArrayList(5), initializers = new LinkedList(),
- valueOverrides = new LinkedList(); }
(
// Initializer
{ Statement init; }
init = Block()
! { initializers.add(init); }
|
LOOKAHEAD ( "override" ident() "=" )
{ LocatedString fname; Expression value;}
"override" fname=ident() "=" value=Expression() ";"
! { valueOverrides.add(impl.makeValueOverride(fname, value)); }
|
LOOKAHEAD( fieldLookahead() )
! overrides = getField(impl, fields, overrides, storeDocString)
| { Definition m; Token t = getToken(1); boolean isOverride = false; }
[ "public" | "private" ]
--- 1049,1067 ----
(
"{"
! { CNiceClass impl = new CNiceClass(res); List methods = new ArrayList();}
// internal fields and methods
(
// Initializer
{ Statement init; }
init = Block()
! { impl.addInitializer(init); }
|
LOOKAHEAD ( "override" ident() "=" )
{ LocatedString fname; Expression value;}
"override" fname=ident() "=" value=Expression() ";"
! { impl.addValueOverride(fname, value); }
|
LOOKAHEAD( fieldLookahead() )
! getField(impl, storeDocString)
| { Definition m; Token t = getToken(1); boolean isOverride = false; }
[ "public" | "private" ]
***************
*** 1086,1093 ****
"}"
{
- impl.setFields(fields);
- impl.setOverrides(overrides);
- impl.setValueOverrides(valueOverrides);
- impl.setInitializers(initializers);
res.setImplementation(impl);
definitions.addAll(methods);
--- 1081,1084 ----
|
