From: <vj...@us...> - 2009-11-27 23:36:36
|
Revision: 12201 http://x10.svn.sourceforge.net/x10/?rev=12201&view=rev Author: vj0 Date: 2009-11-27 23:36:26 +0000 (Fri, 27 Nov 2009) Log Message: ----------- Changed Object.location ==> Object.home. Fixed all tests. Modified Paths: -------------- trunk/x10.compiler/src/x10/ast/PlacedClosure_c.java trunk/x10.compiler/src/x10/ast/X10Call_c.java trunk/x10.compiler/src/x10/ast/X10ClassDecl_c.java trunk/x10.compiler/src/x10/ast/X10Field_c.java trunk/x10.compiler/src/x10/ast/X10New_c.java trunk/x10.compiler/src/x10/ast/X10Special_c.java trunk/x10.compiler/src/x10/parser/X10Parser.java trunk/x10.compiler/src/x10/parser/X10Parserprs.java trunk/x10.compiler/src/x10/parser/X10Parsersym.java trunk/x10.compiler/src/x10/parser/x10.g trunk/x10.compiler/src/x10/types/X10ClassDef_c.java trunk/x10.compiler/src/x10/types/X10Context_c.java trunk/x10.compiler/src/x10/types/X10TypeSystem.java trunk/x10.compiler/src/x10/types/X10TypeSystem_c.java trunk/x10.compiler/src/x10/types/XTypeTranslator.java trunk/x10.compiler/src/x10/util/Any.java trunk/x10.compiler/src/x10/util/Struct.java trunk/x10.compiler/src/x10/visit/Desugarer.java trunk/x10.compiler/src/x10/visit/X10PrettyPrinterVisitor.java trunk/x10.constraints/src/x10/constraint/XConstraint_c.java trunk/x10.constraints/src/x10/constraint/XPromise_c.java trunk/x10.runtime/src-java/x10/core/Ref.java trunk/x10.runtime/src-java/x10/runtime/impl/java/PlaceLocalHandle.java trunk/x10.runtime/src-java/x10/runtime/impl/java/Runtime.java trunk/x10.runtime/src-java/x10/runtime/impl/java/Thread.java trunk/x10.runtime/src-x10/x10/array/FastArray.x10 trunk/x10.runtime/src-x10/x10/lang/Object.x10 trunk/x10.runtime/src-x10/x10/lang/System.x10 trunk/x10.runtime/src-x10/x10/runtime/Future_c.x10 trunk/x10.runtime/src-x10/x10/runtime/Runtime.x10 trunk/x10.runtime/src-x10/x10/runtime/RuntimeClock.x10 trunk/x10.runtime/src-x10/x10/runtime/Thread.x10 trunk/x10.tests/examples/Benchmarks/DistRandomAccess1.x10 trunk/x10.tests/examples/Constructs/Array/FlattenPlaceCast.x10 trunk/x10.tests/examples/Constructs/Array/UserDefinedArray.x10 trunk/x10.tests/examples/Constructs/Async/AsyncNext.x10 trunk/x10.tests/examples/Constructs/Async/AsyncTest5.x10 trunk/x10.tests/examples/Constructs/At/AtNext.x10 trunk/x10.tests/examples/Constructs/AtEach/AtEach.x10 trunk/x10.tests/examples/Constructs/AtEach/AtEach2.x10 trunk/x10.tests/examples/Constructs/AtEach/AtEachLoopOnArray.x10 trunk/x10.tests/examples/Constructs/Atomic/Atomic1.x10 trunk/x10.tests/examples/Constructs/Atomic/Atomic2.x10 trunk/x10.tests/examples/Constructs/Atomic/AtomicMethodTest.x10 trunk/x10.tests/examples/Constructs/Atomic/AtomicTest.x10 trunk/x10.tests/examples/Constructs/Atomic/AwaitTest.x10 trunk/x10.tests/examples/Constructs/Atomic/ConditionalAtomicQueue.x10 trunk/x10.tests/examples/Constructs/Atomic/ConditionalAtomicTest.x10 trunk/x10.tests/examples/Constructs/GC/RemoteRef.x10 trunk/x10.tests/examples/Constructs/Place/AtThisIntoAtHere.x10 trunk/x10.tests/examples/Constructs/Place/AtThisIntoAtHere_MustFailCompile.x10 trunk/x10.tests/examples/Constructs/Place/B_AtThisIntoAtHere.x10 trunk/x10.tests/examples/Constructs/Place/B_AtThisIntoAtHere_MustFailCompile.x10 trunk/x10.tests/examples/Constructs/Place/FieldReceiverIsExpr.x10 trunk/x10.tests/examples/Constructs/Types/PrimitiveHasLocation_MustFailCompile.x10 trunk/x10.tests/examples/Constructs/Types/PrimitiveLiteralHasLocation_MustFailCompile.x10 trunk/x10.tests/examples/Issues/XTENLANG_131.x10 trunk/x10.tests/examples/Issues/XTENLANG_257.x10 Modified: trunk/x10.compiler/src/x10/ast/PlacedClosure_c.java =================================================================== --- trunk/x10.compiler/src/x10/ast/PlacedClosure_c.java 2009-11-27 16:51:51 UTC (rev 12200) +++ trunk/x10.compiler/src/x10/ast/PlacedClosure_c.java 2009-11-27 23:36:26 UTC (rev 12201) @@ -128,7 +128,7 @@ } try { d= d.substitute(src, d.self()); - pt = XConstrainedTerm.make(ts.locVar(src,xc), d); + pt = XConstrainedTerm.make(ts.homeVar(src,xc), d); } catch (XFailure z) { assert false; throw new InternalCompilerError("Cannot construct placeTerm from " + Modified: trunk/x10.compiler/src/x10/ast/X10Call_c.java =================================================================== --- trunk/x10.compiler/src/x10/ast/X10Call_c.java 2009-11-27 16:51:51 UTC (rev 12200) +++ trunk/x10.compiler/src/x10/ast/X10Call_c.java 2009-11-27 23:36:26 UTC (rev 12201) @@ -76,8 +76,7 @@ import x10.visit.TryTypeChecker; /** - * A method call wrapper to rewrite getLocation() calls on primitives - * and array operator calls. And perform other dep type processing on some selected method calls. + * Representation of an X10 method call. * @author Igor */ public class X10Call_c extends Call_c implements X10Call, X10ProcedureCall { Modified: trunk/x10.compiler/src/x10/ast/X10ClassDecl_c.java =================================================================== --- trunk/x10.compiler/src/x10/ast/X10ClassDecl_c.java 2009-11-27 16:51:51 UTC (rev 12200) +++ trunk/x10.compiler/src/x10/ast/X10ClassDecl_c.java 2009-11-27 23:36:26 UTC (rev 12201) @@ -357,7 +357,7 @@ } } - // Now add this.location == currentLocation + // Now add this.home == currentHome /* XConstrainedTerm placeTerm = xc.currentPlaceTerm().copy(); XRoot thisVar = type.thisVar(); XTerm placeVar = ((X10TypeSystem) type.typeSystem()).locVar(type.thisVar(), xc); Modified: trunk/x10.compiler/src/x10/ast/X10Field_c.java =================================================================== --- trunk/x10.compiler/src/x10/ast/X10Field_c.java 2009-11-27 16:51:51 UTC (rev 12200) +++ trunk/x10.compiler/src/x10/ast/X10Field_c.java 2009-11-27 23:36:26 UTC (rev 12201) @@ -57,10 +57,7 @@ /** - * An immutable representation of an X10 Field access. It is the same as a Java - * field access except for accesses of the field "location" for value types. - * In this implementation such field accesses are implemented by the method call - * x10.lang.Runtime.here(). + * An immutable representation of an X10 Field access. * * @author vj May 23, 2005 */ Modified: trunk/x10.compiler/src/x10/ast/X10New_c.java =================================================================== --- trunk/x10.compiler/src/x10/ast/X10New_c.java 2009-11-27 16:51:51 UTC (rev 12200) +++ trunk/x10.compiler/src/x10/ast/X10New_c.java 2009-11-27 23:36:26 UTC (rev 12201) @@ -543,7 +543,7 @@ * variables whose types are determined by the static type of the receiver * and the actual arguments to the call. * - * Also add the self.location==here clause. + * Also add the self.home==here clause. * * @param tc * @return @@ -555,12 +555,12 @@ Type type = xci.returnType(); X10TypeSystem ts = (X10TypeSystem) tc.typeSystem(); - // Add self.location == here to the return type. + // Add self.home == here to the return type. if (! ts.isStructType(type)) { XTerm selfVar = X10TypeMixin.selfVar(type); X10TypeSystem xts = (X10TypeSystem) tc.typeSystem(); X10Context xc = (X10Context) tc.context(); - XTerm locVar = xts.locVar(selfVar, xc); + XTerm locVar = xts.homeVar(selfVar, xc); type = X10TypeMixin.addBinding(type, locVar, xc.currentPlaceTerm()); // Add self != null Modified: trunk/x10.compiler/src/x10/ast/X10Special_c.java =================================================================== --- trunk/x10.compiler/src/x10/ast/X10Special_c.java 2009-11-27 16:51:51 UTC (rev 12200) +++ trunk/x10.compiler/src/x10/ast/X10Special_c.java 2009-11-27 23:36:26 UTC (rev 12201) @@ -147,7 +147,7 @@ XVar var = (XVar) xts.xtypeTranslator().trans(cc, this, c); cc.addSelfBinding(var); cc.setThisVar(var); - XTerm locVar = xts.locVar(var, c); + XTerm locVar = xts.homeVar(var, c); XConstrainedTerm thisPlace = c.currentThisPlace(); assert locVar != null; assert thisPlace != null; Modified: trunk/x10.compiler/src/x10/parser/X10Parser.java =================================================================== --- trunk/x10.compiler/src/x10/parser/X10Parser.java 2009-11-27 16:51:51 UTC (rev 12200) +++ trunk/x10.compiler/src/x10/parser/X10Parser.java 2009-11-27 23:36:26 UTC (rev 12201) @@ -1,5 +1,5 @@ -//#line 18 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" +//#line 18 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" // // Licensed Material // (C) Copyright IBM Corp, 2006 @@ -9,7 +9,7 @@ import lpg.runtime.*; -//#line 28 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" +//#line 28 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" import java.util.Arrays; import java.util.ArrayList; import java.util.Collections; @@ -287,7 +287,7 @@ // - //#line 322 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 322 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" private ErrorQueue eq; private X10TypeSystem ts; private X10NodeFactory nf; @@ -862,10 +862,10 @@ // Rule 1: TypeName ::= TypeName . ErrorId // case 1: { - //#line 8 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 6 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 8 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 6 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" ParsedName TypeName = (ParsedName) getRhsSym(1); - //#line 8 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 8 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" setResult(new ParsedName(nf, ts, pos(getLeftSpan(), getRightSpan()), @@ -878,10 +878,10 @@ // Rule 2: PackageName ::= PackageName . ErrorId // case 2: { - //#line 18 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 16 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 18 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 16 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" ParsedName PackageName = (ParsedName) getRhsSym(1); - //#line 18 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 18 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" setResult(new ParsedName(nf, ts, pos(getLeftSpan(), getRightSpan()), @@ -894,10 +894,10 @@ // Rule 3: ExpressionName ::= AmbiguousName . ErrorId // case 3: { - //#line 28 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 26 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 28 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 26 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" ParsedName AmbiguousName = (ParsedName) getRhsSym(1); - //#line 28 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 28 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" setResult(new ParsedName(nf, ts, pos(getLeftSpan(), getRightSpan()), @@ -910,10 +910,10 @@ // Rule 4: MethodName ::= AmbiguousName . ErrorId // case 4: { - //#line 38 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 36 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 38 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 36 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" ParsedName AmbiguousName = (ParsedName) getRhsSym(1); - //#line 38 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 38 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" setResult(new ParsedName(nf, ts, pos(getLeftSpan(), getRightSpan()), @@ -926,10 +926,10 @@ // Rule 5: PackageOrTypeName ::= PackageOrTypeName . ErrorId // case 5: { - //#line 48 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 46 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 48 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 46 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" ParsedName PackageOrTypeName = (ParsedName) getRhsSym(1); - //#line 48 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 48 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" setResult(new ParsedName(nf, ts, pos(getLeftSpan(), getRightSpan()), @@ -942,10 +942,10 @@ // Rule 6: AmbiguousName ::= AmbiguousName . ErrorId // case 6: { - //#line 58 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 56 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 58 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 56 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" ParsedName AmbiguousName = (ParsedName) getRhsSym(1); - //#line 58 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 58 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" setResult(new ParsedName(nf, ts, pos(getLeftSpan(), getRightSpan()), @@ -958,10 +958,10 @@ // Rule 7: FieldAccess ::= Primary . ErrorId // case 7: { - //#line 68 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 66 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 68 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 66 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" Expr Primary = (Expr) getRhsSym(1); - //#line 68 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 68 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" setResult(nf.Field(pos(), Primary, nf.Id(pos(getRightSpan()), "*"))); break; @@ -971,9 +971,9 @@ // Rule 8: FieldAccess ::= super . ErrorId // case 8: { - //#line 74 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 74 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 74 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 74 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" setResult(nf.Field(pos(getRightSpan()), nf.Super(pos(getLeftSpan())), nf.Id(pos(getRightSpan()), "*"))); break; @@ -983,12 +983,12 @@ // Rule 9: FieldAccess ::= ClassName . super$sup . ErrorId // case 9: { - //#line 80 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 78 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 80 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 78 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" ParsedName ClassName = (ParsedName) getRhsSym(1); - //#line 78 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 78 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" IToken sup = (IToken) getRhsIToken(3); - //#line 80 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 80 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" setResult(nf.Field(pos(getRightSpan()), nf.Super(pos(getRhsFirstTokenIndex(3)), ClassName.toType()), nf.Id(pos(getRightSpan()), "*"))); break; @@ -998,12 +998,12 @@ // Rule 10: MethodInvocation ::= MethodPrimaryPrefix ( ArgumentListopt ) // case 10: { - //#line 87 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 85 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 87 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 85 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" Object MethodPrimaryPrefix = (Object) getRhsSym(1); - //#line 85 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 85 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" List ArgumentListopt = (List) getRhsSym(3); - //#line 87 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 87 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" Expr Primary = (Expr) ((Object[]) MethodPrimaryPrefix)[0]; polyglot.lex.Identifier identifier = (polyglot.lex.Identifier) ((Object[]) MethodPrimaryPrefix)[1]; setResult(nf.Call(pos(), Primary, nf.Id(pos(), identifier.getIdentifier()), ArgumentListopt)); @@ -1014,12 +1014,12 @@ // Rule 11: MethodInvocation ::= MethodSuperPrefix ( ArgumentListopt ) // case 11: { - //#line 94 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 92 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 94 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 92 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" polyglot.lex.Identifier MethodSuperPrefix = (polyglot.lex.Identifier) getRhsSym(1); - //#line 92 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 92 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" List ArgumentListopt = (List) getRhsSym(3); - //#line 94 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 94 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" polyglot.lex.Identifier identifier = MethodSuperPrefix; setResult(nf.Call(pos(), nf.Super(pos(getLeftSpan())), nf.Id(pos(), identifier.getIdentifier()), ArgumentListopt)); break; @@ -1029,12 +1029,12 @@ // Rule 12: MethodInvocation ::= MethodClassNameSuperPrefix ( ArgumentListopt ) // case 12: { - //#line 100 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 98 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 100 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 98 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" Object MethodClassNameSuperPrefix = (Object) getRhsSym(1); - //#line 98 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 98 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" List ArgumentListopt = (List) getRhsSym(3); - //#line 100 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 100 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" ParsedName ClassName = (ParsedName) ((Object[]) MethodClassNameSuperPrefix)[0]; JPGPosition super_pos = (JPGPosition) ((Object[]) MethodClassNameSuperPrefix)[1]; polyglot.lex.Identifier identifier = (polyglot.lex.Identifier) ((Object[]) MethodClassNameSuperPrefix)[2]; @@ -1046,12 +1046,12 @@ // Rule 13: MethodPrimaryPrefix ::= Primary . ErrorId$ErrorId // case 13: { - //#line 109 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 107 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 109 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 107 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" Expr Primary = (Expr) getRhsSym(1); - //#line 107 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 107 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" IToken ErrorId = (IToken) getRhsIToken(3); - //#line 109 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 109 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" Object[] a = new Object[2]; a[0] = Primary; a[1] = id(getRhsFirstTokenIndex(3)); @@ -1063,10 +1063,10 @@ // Rule 14: MethodSuperPrefix ::= super . ErrorId$ErrorId // case 14: { - //#line 117 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 115 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 117 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 115 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" IToken ErrorId = (IToken) getRhsIToken(3); - //#line 117 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 117 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" setResult(id(getRhsFirstTokenIndex(3))); break; } @@ -1075,14 +1075,14 @@ // Rule 15: MethodClassNameSuperPrefix ::= ClassName . super$sup . ErrorId$ErrorId // case 15: { - //#line 122 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 120 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 122 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 120 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" ParsedName ClassName = (ParsedName) getRhsSym(1); - //#line 120 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 120 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" IToken sup = (IToken) getRhsIToken(3); - //#line 120 "C:/eclipsews/v9/x10.compiler/src/x10/parser/MissingId.gi" + //#line 120 "C:/eclipsews/head/x10.compiler/src/x10/parser/MissingId.gi" IToken ErrorId = (IToken) getRhsIToken(5); - //#line 122 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 122 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" Object[] a = new Object[3]; a[0] = ClassName; a[1] = pos(getRhsFirstTokenIndex(3)); @@ -1095,20 +1095,20 @@ // Rule 16: TypeDefDeclaration ::= TypeDefModifiersopt type Identifier TypeParametersopt FormalParametersopt WhereClauseopt = Type ; // case 16: { - //#line 892 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 890 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 892 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 890 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List TypeDefModifiersopt = (List) getRhsSym(1); - //#line 890 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 890 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Id Identifier = (Id) getRhsSym(3); - //#line 890 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 890 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List TypeParametersopt = (List) getRhsSym(4); - //#line 890 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 890 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List FormalParametersopt = (List) getRhsSym(5); - //#line 890 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 890 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" DepParameterExpr WhereClauseopt = (DepParameterExpr) getRhsSym(6); - //#line 890 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 890 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" TypeNode Type = (TypeNode) getRhsSym(8); - //#line 892 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 892 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" FlagsNode f = extractFlags(TypeDefModifiersopt); List annotations = extractAnnotations(TypeDefModifiersopt); for (Formal v : (List<Formal>) FormalParametersopt) { @@ -1124,18 +1124,18 @@ // Rule 17: TypeDefDeclaration ::= TypeDefModifiersopt type Identifier TypeParametersopt FormalParametersopt WhereClauseopt ; // case 17: { - //#line 904 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 902 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 904 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 902 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List TypeDefModifiersopt = (List) getRhsSym(1); - //#line 902 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 902 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Id Identifier = (Id) getRhsSym(3); - //#line 902 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 902 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List TypeParametersopt = (List) getRhsSym(4); - //#line 902 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 902 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List FormalParametersopt = (List) getRhsSym(5); - //#line 902 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 902 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" DepParameterExpr WhereClauseopt = (DepParameterExpr) getRhsSym(6); - //#line 904 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 904 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" FlagsNode f = extractFlags(TypeDefModifiersopt); List annotations = extractAnnotations(TypeDefModifiersopt); for (Formal v : (List<Formal>) FormalParametersopt) { @@ -1151,10 +1151,10 @@ // Rule 18: Properties ::= ( PropertyList ) // case 18: { - //#line 917 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 915 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 917 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 915 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List PropertyList = (List) getRhsSym(2); - //#line 917 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 917 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" setResult(PropertyList); break; } @@ -1162,10 +1162,10 @@ // Rule 19: PropertyList ::= Property // case 19: { - //#line 922 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 920 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 922 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 920 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" PropertyDecl Property = (PropertyDecl) getRhsSym(1); - //#line 922 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 922 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" List l = new TypedList(new LinkedList(), PropertyDecl.class, false); l.add(Property); setResult(l); @@ -1176,12 +1176,12 @@ // Rule 20: PropertyList ::= PropertyList , Property // case 20: { - //#line 929 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 927 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 929 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 927 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List PropertyList = (List) getRhsSym(1); - //#line 927 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 927 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" PropertyDecl Property = (PropertyDecl) getRhsSym(3); - //#line 929 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 929 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" PropertyList.add(Property); break; } @@ -1190,14 +1190,14 @@ // Rule 21: Property ::= Annotationsopt Identifier ResultType // case 21: { - //#line 936 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 934 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 936 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 934 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List Annotationsopt = (List) getRhsSym(1); - //#line 934 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 934 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Id Identifier = (Id) getRhsSym(2); - //#line 934 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 934 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" TypeNode ResultType = (TypeNode) getRhsSym(3); - //#line 936 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 936 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" List annotations = extractAnnotations(Annotationsopt); PropertyDecl cd = nf.PropertyDecl(pos(), nf.FlagsNode(pos(), Flags.PUBLIC.Final()), ResultType, Identifier); cd = (PropertyDecl) ((X10Ext) cd.ext()).annotations(annotations); @@ -1209,24 +1209,24 @@ // Rule 22: MethodDeclaration ::= MethodModifiersopt def Identifier TypeParametersopt FormalParameters WhereClauseopt ResultTypeopt Throwsopt MethodBody // case 22: { - //#line 945 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 943 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 945 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 943 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List MethodModifiersopt = (List) getRhsSym(1); - //#line 943 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 943 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Id Identifier = (Id) getRhsSym(3); - //#line 943 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 943 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List TypeParametersopt = (List) getRhsSym(4); - //#line 943 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 943 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List FormalParameters = (List) getRhsSym(5); - //#line 943 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 943 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" DepParameterExpr WhereClauseopt = (DepParameterExpr) getRhsSym(6); - //#line 943 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 943 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" TypeNode ResultTypeopt = (TypeNode) getRhsSym(7); - //#line 943 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 943 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List Throwsopt = (List) getRhsSym(8); - //#line 943 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 943 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Block MethodBody = (Block) getRhsSym(9); - //#line 945 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 945 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" if (Identifier.id().toString().equals("this")) { ConstructorDecl cd = nf.X10ConstructorDecl(pos(), extractFlags(MethodModifiersopt), @@ -1260,26 +1260,26 @@ // Rule 23: MethodDeclaration ::= MethodModifiersopt operator TypeParametersopt ( FormalParameter$fp1 ) BinOp ( FormalParameter$fp2 ) WhereClauseopt ResultTypeopt Throwsopt MethodBody // case 23: { - //#line 975 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 973 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 975 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 973 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List MethodModifiersopt = (List) getRhsSym(1); - //#line 973 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 973 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List TypeParametersopt = (List) getRhsSym(3); - //#line 973 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 973 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" X10Formal fp1 = (X10Formal) getRhsSym(5); - //#line 973 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 973 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Binary.Operator BinOp = (Binary.Operator) getRhsSym(7); - //#line 973 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 973 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" X10Formal fp2 = (X10Formal) getRhsSym(9); - //#line 973 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 973 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" DepParameterExpr WhereClauseopt = (DepParameterExpr) getRhsSym(11); - //#line 973 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 973 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" TypeNode ResultTypeopt = (TypeNode) getRhsSym(12); - //#line 973 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 973 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List Throwsopt = (List) getRhsSym(13); - //#line 973 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 973 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Block MethodBody = (Block) getRhsSym(14); - //#line 975 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 975 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" MethodDecl md = nf.X10MethodDecl(pos(getRhsFirstTokenIndex(1), getRhsLastTokenIndex(14)), extractFlags(MethodModifiersopt), ResultTypeopt == null ? nf.UnknownTypeNode(pos()) : ResultTypeopt, @@ -1300,24 +1300,24 @@ // Rule 24: MethodDeclaration ::= MethodModifiersopt operator TypeParametersopt PrefixOp ( FormalParameter$fp2 ) WhereClauseopt ResultTypeopt Throwsopt MethodBody // case 24: { - //#line 992 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 990 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 992 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 990 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List MethodModifiersopt = (List) getRhsSym(1); - //#line 990 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 990 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List TypeParametersopt = (List) getRhsSym(3); - //#line 990 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 990 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Unary.Operator PrefixOp = (Unary.Operator) getRhsSym(4); - //#line 990 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 990 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" X10Formal fp2 = (X10Formal) getRhsSym(6); - //#line 990 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 990 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" DepParameterExpr WhereClauseopt = (DepParameterExpr) getRhsSym(8); - //#line 990 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 990 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" TypeNode ResultTypeopt = (TypeNode) getRhsSym(9); - //#line 990 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 990 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List Throwsopt = (List) getRhsSym(10); - //#line 990 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 990 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Block MethodBody = (Block) getRhsSym(11); - //#line 992 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 992 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" MethodDecl md = nf.X10MethodDecl(pos(getRhsFirstTokenIndex(1), getRhsLastTokenIndex(11)), extractFlags(MethodModifiersopt), ResultTypeopt == null ? nf.UnknownTypeNode(pos()) : ResultTypeopt, @@ -1338,24 +1338,24 @@ // Rule 25: MethodDeclaration ::= MethodModifiersopt operator TypeParametersopt this BinOp ( FormalParameter$fp2 ) WhereClauseopt ResultTypeopt Throwsopt MethodBody // case 25: { - //#line 1009 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 1007 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1009 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 1007 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List MethodModifiersopt = (List) getRhsSym(1); - //#line 1007 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1007 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List TypeParametersopt = (List) getRhsSym(3); - //#line 1007 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1007 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Binary.Operator BinOp = (Binary.Operator) getRhsSym(5); - //#line 1007 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1007 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" X10Formal fp2 = (X10Formal) getRhsSym(7); - //#line 1007 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1007 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" DepParameterExpr WhereClauseopt = (DepParameterExpr) getRhsSym(9); - //#line 1007 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1007 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" TypeNode ResultTypeopt = (TypeNode) getRhsSym(10); - //#line 1007 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1007 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List Throwsopt = (List) getRhsSym(11); - //#line 1007 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1007 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Block MethodBody = (Block) getRhsSym(12); - //#line 1009 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 1009 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" MethodDecl md = nf.X10MethodDecl(pos(getRhsFirstTokenIndex(1), getRhsLastTokenIndex(12)), extractFlags(MethodModifiersopt), ResultTypeopt == null ? nf.UnknownTypeNode(pos()) : ResultTypeopt, @@ -1377,24 +1377,24 @@ // Rule 26: MethodDeclaration ::= MethodModifiersopt operator TypeParametersopt ( FormalParameter$fp1 ) BinOp this WhereClauseopt ResultTypeopt Throwsopt MethodBody // case 26: { - //#line 1027 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 1025 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1027 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 1025 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List MethodModifiersopt = (List) getRhsSym(1); - //#line 1025 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1025 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List TypeParametersopt = (List) getRhsSym(3); - //#line 1025 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1025 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" X10Formal fp1 = (X10Formal) getRhsSym(5); - //#line 1025 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1025 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Binary.Operator BinOp = (Binary.Operator) getRhsSym(7); - //#line 1025 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1025 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" DepParameterExpr WhereClauseopt = (DepParameterExpr) getRhsSym(9); - //#line 1025 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1025 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" TypeNode ResultTypeopt = (TypeNode) getRhsSym(10); - //#line 1025 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1025 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List Throwsopt = (List) getRhsSym(11); - //#line 1025 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1025 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Block MethodBody = (Block) getRhsSym(12); - //#line 1027 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 1027 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" Name op = X10Binary_c.invBinaryMethodName(BinOp); MethodDecl md = nf.X10MethodDecl(pos(getRhsFirstTokenIndex(1), getRhsLastTokenIndex(12)), extractFlags(MethodModifiersopt), @@ -1417,22 +1417,22 @@ // Rule 27: MethodDeclaration ::= MethodModifiersopt operator TypeParametersopt PrefixOp this WhereClauseopt ResultTypeopt Throwsopt MethodBody // case 27: { - //#line 1046 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 1044 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1046 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 1044 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List MethodModifiersopt = (List) getRhsSym(1); - //#line 1044 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1044 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List TypeParametersopt = (List) getRhsSym(3); - //#line 1044 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1044 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Unary.Operator PrefixOp = (Unary.Operator) getRhsSym(4); - //#line 1044 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1044 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" DepParameterExpr WhereClauseopt = (DepParameterExpr) getRhsSym(6); - //#line 1044 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1044 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" TypeNode ResultTypeopt = (TypeNode) getRhsSym(7); - //#line 1044 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1044 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List Throwsopt = (List) getRhsSym(8); - //#line 1044 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1044 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Block MethodBody = (Block) getRhsSym(9); - //#line 1046 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 1046 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" MethodDecl md = nf.X10MethodDecl(pos(getRhsFirstTokenIndex(1), getRhsLastTokenIndex(9)), extractFlags(MethodModifiersopt), ResultTypeopt == null ? nf.UnknownTypeNode(pos()) : ResultTypeopt, @@ -1453,22 +1453,22 @@ // Rule 28: MethodDeclaration ::= MethodModifiersopt operator this TypeParametersopt FormalParameters WhereClauseopt ResultTypeopt Throwsopt MethodBody // case 28: { - //#line 1063 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 1061 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1063 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 1061 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List MethodModifiersopt = (List) getRhsSym(1); - //#line 1061 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1061 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List TypeParametersopt = (List) getRhsSym(4); - //#line 1061 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1061 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List FormalParameters = (List) getRhsSym(5); - //#line 1061 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1061 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" DepParameterExpr WhereClauseopt = (DepParameterExpr) getRhsSym(6); - //#line 1061 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1061 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" TypeNode ResultTypeopt = (TypeNode) getRhsSym(7); - //#line 1061 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1061 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List Throwsopt = (List) getRhsSym(8); - //#line 1061 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1061 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Block MethodBody = (Block) getRhsSym(9); - //#line 1063 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 1063 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" MethodDecl md = nf.X10MethodDecl(pos(getRhsFirstTokenIndex(1), getRhsLastTokenIndex(9)), extractFlags(MethodModifiersopt), ResultTypeopt == null ? nf.UnknownTypeNode(pos()) : ResultTypeopt, @@ -1489,24 +1489,24 @@ // Rule 29: MethodDeclaration ::= MethodModifiersopt operator this TypeParametersopt FormalParameters = ( FormalParameter$fp2 ) WhereClauseopt ResultTypeopt Throwsopt MethodBody // case 29: { - //#line 1080 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 1078 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1080 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 1078 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List MethodModifiersopt = (List) getRhsSym(1); - //#line 1078 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1078 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List TypeParametersopt = (List) getRhsSym(4); - //#line 1078 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1078 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List FormalParameters = (List) getRhsSym(5); - //#line 1078 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1078 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" X10Formal fp2 = (X10Formal) getRhsSym(8); - //#line 1078 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1078 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" DepParameterExpr WhereClauseopt = (DepParameterExpr) getRhsSym(10); - //#line 1078 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1078 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" TypeNode ResultTypeopt = (TypeNode) getRhsSym(11); - //#line 1078 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1078 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List Throwsopt = (List) getRhsSym(12); - //#line 1078 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1078 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Block MethodBody = (Block) getRhsSym(13); - //#line 1080 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 1080 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" MethodDecl md = nf.X10MethodDecl(pos(getRhsFirstTokenIndex(1), getRhsLastTokenIndex(13)), extractFlags(MethodModifiersopt), ResultTypeopt == null ? nf.UnknownTypeNode(pos()) : ResultTypeopt, @@ -1527,22 +1527,22 @@ // Rule 30: MethodDeclaration ::= MethodModifiersopt operator TypeParametersopt ( FormalParameter$fp1 ) as Type WhereClauseopt Throwsopt MethodBody // case 30: { - //#line 1097 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 1095 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1097 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 1095 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List MethodModifiersopt = (List) getRhsSym(1); - //#line 1095 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1095 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List TypeParametersopt = (List) getRhsSym(3); - //#line 1095 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1095 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" X10Formal fp1 = (X10Formal) getRhsSym(5); - //#line 1095 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1095 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" TypeNode Type = (TypeNode) getRhsSym(8); - //#line 1095 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1095 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" DepParameterExpr WhereClauseopt = (DepParameterExpr) getRhsSym(9); - //#line 1095 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1095 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List Throwsopt = (List) getRhsSym(10); - //#line 1095 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1095 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Block MethodBody = (Block) getRhsSym(11); - //#line 1097 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 1097 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" MethodDecl md = nf.X10MethodDecl(pos(getRhsFirstTokenIndex(1), getRhsLastTokenIndex(11)), extractFlags(MethodModifiersopt), Type, @@ -1563,22 +1563,22 @@ // Rule 31: MethodDeclaration ::= MethodModifiersopt operator TypeParametersopt ( FormalParameter$fp1 ) as ? WhereClauseopt ResultTypeopt Throwsopt MethodBody // case 31: { - //#line 1114 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 1112 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1114 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 1112 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List MethodModifiersopt = (List) getRhsSym(1); - //#line 1112 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1112 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List TypeParametersopt = (List) getRhsSym(3); - //#line 1112 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1112 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" X10Formal fp1 = (X10Formal) getRhsSym(5); - //#line 1112 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1112 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" DepParameterExpr WhereClauseopt = (DepParameterExpr) getRhsSym(9); - //#line 1112 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1112 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" TypeNode ResultTypeopt = (TypeNode) getRhsSym(10); - //#line 1112 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1112 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List Throwsopt = (List) getRhsSym(11); - //#line 1112 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1112 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" Block MethodBody = (Block) getRhsSym(12); - //#line 1114 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 1114 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" MethodDecl md = nf.X10MethodDecl(pos(getRhsFirstTokenIndex(1), getRhsLastTokenIndex(12)), extractFlags(MethodModifiersopt), ResultTypeopt == null ? nf.UnknownTypeNode(pos()) : ResultTypeopt, @@ -1599,22 +1599,22 @@ // Rule 32: MethodDeclaration ::= MethodModifiersopt operator TypeParametersopt ( FormalParameter$fp1 ) WhereClauseopt ResultTypeopt Throwsopt MethodBody // case 32: { - //#line 1131 "C:/eclipsews/v9/lpg.generator/templates/java/btParserTemplateF.gi" - //#line 1129 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1131 "C:/eclipsews/head/lpg.generator/templates/java/btParserTemplateF.gi" + //#line 1129 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List MethodModifiersopt = (List) getRhsSym(1); - //#line 1129 "C:/eclipsews/v9/x10.compiler/src/x10/parser/x10.g" + //#line 1129 "C:/eclipsews/head/x10.compiler/src/x10/parser/x10.g" List TypeParametersopt = (List) getRhsSym(3); - //#line 1129 "C:/eclipsews/v9/x10.compiler/src/x... [truncated message content] |