Browse Source

fixed build

pull/2/head
Siegfried Pammer 15 years ago
parent
commit
dbbb9d1d9a
  1. 2
      src/Libraries/NRefactory/Project/NRefactory.csproj
  2. 16
      src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs
  3. 16
      src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG

2
src/Libraries/NRefactory/Project/NRefactory.csproj

@ -166,7 +166,7 @@ @@ -166,7 +166,7 @@
<Content Include="Src\Lexer\VBNet\KeywordList.txt" />
<Folder Include="Src\Parser" />
<Folder Include="Src\Parser\CSharp" />
<Content Include="Src\Parser\CSharp\cs.ATG" />
<None Include="Src\Parser\CSharp\cs.ATG" />
<Folder Include="Src\Parser\Frames" />
<Content Include="Src\Parser\Frames\Scanner.frame" />
<Content Include="Src\Parser\Frames\SharpCoco.exe" />

16
src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs

@ -4229,37 +4229,37 @@ IsTypeCast()) { @@ -4229,37 +4229,37 @@ IsTypeCast()) {
lexer.NextToken();
#line 1826 "cs.ATG"
expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Minus) { StartLocation = t.Location }));
expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Minus) { StartLocation = t.Location });
} else if (la.kind == 24) {
lexer.NextToken();
#line 1827 "cs.ATG"
expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Not) { StartLocation = t.Location }));
expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Not) { StartLocation = t.Location });
} else if (la.kind == 27) {
lexer.NextToken();
#line 1828 "cs.ATG"
expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitNot) { StartLocation = t.Location }));
expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitNot) { StartLocation = t.Location });
} else if (la.kind == 6) {
lexer.NextToken();
#line 1829 "cs.ATG"
expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Dereference) { StartLocation = t.Location }));
expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Dereference) { StartLocation = t.Location });
} else if (la.kind == 31) {
lexer.NextToken();
#line 1830 "cs.ATG"
expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Increment) { StartLocation = t.Location }));
expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Increment) { StartLocation = t.Location });
} else if (la.kind == 32) {
lexer.NextToken();
#line 1831 "cs.ATG"
expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Decrement) { StartLocation = t.Location }));
expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Decrement) { StartLocation = t.Location });
} else if (la.kind == 28) {
lexer.NextToken();
#line 1832 "cs.ATG"
expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.AddressOf) { StartLocation = t.Location }));
expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.AddressOf) { StartLocation = t.Location });
} else {
Expect(20);
Type(
@ -4268,7 +4268,7 @@ out type); @@ -4268,7 +4268,7 @@ out type);
Expect(21);
#line 1838 "cs.ATG"
expressions.Add(new CastExpression(type) { StartLocation = t.Location }));
expressions.Add(new CastExpression(type) { StartLocation = t.Location });
}
}
if (

16
src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG

@ -1823,19 +1823,19 @@ UnaryExpr<out Expression uExpr> @@ -1823,19 +1823,19 @@ UnaryExpr<out Expression uExpr>
/* IF (Tokens.UnaryOp[la.kind] || IsTypeCast()) */
(
"+" (. expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Plus) { StartLocation = t.Location }); .)
| "-" (. expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Minus) { StartLocation = t.Location })); .)
| "!" (. expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Not) { StartLocation = t.Location })); .)
| "~" (. expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitNot) { StartLocation = t.Location })); .)
| "*" (. expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Dereference) { StartLocation = t.Location })); .)
| "++" (. expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Increment) { StartLocation = t.Location })); .)
| "--" (. expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Decrement) { StartLocation = t.Location })); .)
| "&" (. expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.AddressOf) { StartLocation = t.Location })); .)
| "-" (. expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Minus) { StartLocation = t.Location }); .)
| "!" (. expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Not) { StartLocation = t.Location }); .)
| "~" (. expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitNot) { StartLocation = t.Location }); .)
| "*" (. expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Dereference) { StartLocation = t.Location }); .)
| "++" (. expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Increment) { StartLocation = t.Location }); .)
| "--" (. expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Decrement) { StartLocation = t.Location }); .)
| "&" (. expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.AddressOf) { StartLocation = t.Location }); .)
/*--- cast expression: */
/* Problem: "(" Type ")" from here and *
* "(" Expr ")" from PrimaryExpr *
* Solution: (in IsTypeCast()) */
| IF (IsTypeCast()) "(" Type<out type> ")" (. expressions.Add(new CastExpression(type) { StartLocation = t.Location })); .)
| IF (IsTypeCast()) "(" Type<out type> ")" (. expressions.Add(new CastExpression(type) { StartLocation = t.Location }); .)
)
}

Loading…
Cancel
Save