Author: olivier
Date: 2007-09-06 15:08:16 -0400 (Thu, 06 Sep 2007)
New Revision: 85439
Modified:
trunk/olive/class/Microsoft.JScript.Compiler/Microsoft.JScript.Compiler/ChangeLog
trunk/olive/class/Microsoft.JScript.Compiler/Microsoft.JScript.Compiler/TokenCategorizer.cs
trunk/olive/class/Microsoft.JScript.Compiler/Microsoft.JScript.Compiler/Tokenizer.cs
Log:
2007-09-06 Olivier Dufour <[EMAIL PROTECTED]>
* Tokenizer.cs: Fix 3 bugs (export & packate keyword, bang token)
* TokenCategorizer.cs: fix all category and trigger with unit test
Modified:
trunk/olive/class/Microsoft.JScript.Compiler/Microsoft.JScript.Compiler/ChangeLog
===================================================================
---
trunk/olive/class/Microsoft.JScript.Compiler/Microsoft.JScript.Compiler/ChangeLog
2007-09-06 18:39:45 UTC (rev 85438)
+++
trunk/olive/class/Microsoft.JScript.Compiler/Microsoft.JScript.Compiler/ChangeLog
2007-09-06 19:08:16 UTC (rev 85439)
@@ -1,7 +1,12 @@
2007-09-06 Olivier Dufour <[EMAIL PROTECTED]>
- * TokenCategorizer.cs: Implment ReadToken and start to do unit test on
it
+ * Tokenizer.cs: Fix 3 bugs (export & Packate keyword, bang token)
+ * TokenCategorizer.cs: fix all category and trigger with unit test
+2007-09-06 Olivier Dufour <[EMAIL PROTECTED]>
+
+ * TokenCategorizer.cs: Implement ReadToken and start to do unit test on
it
+
2007-08-25 Olivier Dufour <[EMAIL PROTECTED]>
* RowanGenerator.cs: code quite all statement things.
Modified:
trunk/olive/class/Microsoft.JScript.Compiler/Microsoft.JScript.Compiler/TokenCategorizer.cs
===================================================================
---
trunk/olive/class/Microsoft.JScript.Compiler/Microsoft.JScript.Compiler/TokenCategorizer.cs
2007-09-06 18:39:45 UTC (rev 85438)
+++
trunk/olive/class/Microsoft.JScript.Compiler/Microsoft.JScript.Compiler/TokenCategorizer.cs
2007-09-06 19:08:16 UTC (rev 85439)
@@ -45,7 +45,7 @@
public override void Initialize(object state, SourceUnitReader
sourceReader, SourceLocation initialLocation)
{
- Tokenizer tokenizer = new Tokenizer
(sourceReader.ReadToEnd ().ToCharArray (), new IdentifierTable ());
+ tokenizer = new Tokenizer (sourceReader.ReadToEnd
().ToCharArray (), new IdentifierTable ());
tokenizer.Position = initialLocation;
this.state = state;
errorSink = new ErrorSink ();
@@ -65,6 +65,9 @@
{
switch (type) {
case Token.Type.None:
+ case Token.Type.final:
+ case Token.Type.OctalIntegerLiteral:
+ case Token.Type.HexIntegerLiteral:
return TokenCategory.None;
case Token.Type.EndOfInput:
return TokenCategory.EndOfStream;
@@ -156,7 +159,6 @@
case [EMAIL PROTECTED]:
case Token.Type.super:
case [EMAIL PROTECTED]:
- case Token.Type.final:
case Token.Type.native:
case Token.Type.synchronized:
case [EMAIL PROTECTED]:
@@ -178,8 +180,6 @@
case [EMAIL PROTECTED]:
case [EMAIL PROTECTED]:
return TokenCategory.Keyword;
- case Token.Type.HexIntegerLiteral:
- case Token.Type.OctalIntegerLiteral:
case Token.Type.NumericLiteral:
return TokenCategory.NumericLiteral;
case Token.Type.StringLiteral:
@@ -190,8 +190,6 @@
return TokenCategory.Identifier;
case Token.Type.Bad:
return TokenCategory.Error;
- case Token.Type.Comment:
- return TokenCategory.Comment;
}
return TokenCategory.None;
}
@@ -321,7 +319,6 @@
case Token.Type.RegularExpressionLiteral:
case Token.Type.Identifier:
case Token.Type.Bad:
- case Token.Type.Comment:
return TokenTriggers.None;
}
return TokenTriggers.None;
Modified:
trunk/olive/class/Microsoft.JScript.Compiler/Microsoft.JScript.Compiler/Tokenizer.cs
===================================================================
---
trunk/olive/class/Microsoft.JScript.Compiler/Microsoft.JScript.Compiler/Tokenizer.cs
2007-09-06 18:39:45 UTC (rev 85438)
+++
trunk/olive/class/Microsoft.JScript.Compiler/Microsoft.JScript.Compiler/Tokenizer.cs
2007-09-06 19:08:16 UTC (rev 85439)
@@ -152,7 +152,7 @@
return CreateToken
(Token.Type.BangEqual);
}
}
- break;
+ return CreateToken (Token.Type.Bang);
case '+':
if (next == '+') {
ReadChar ();
@@ -695,7 +695,7 @@
keywords.Add ("int", [EMAIL PROTECTED]);
keywords.Add ("short", [EMAIL PROTECTED]);
keywords.Add ("boolean", Token.Type.boolean);
- keywords.Add ("Export", Token.Type.export);
+ keywords.Add ("export", Token.Type.export);
keywords.Add ("interface", [EMAIL PROTECTED]);
keywords.Add ("static", [EMAIL PROTECTED]);
keywords.Add ("byte", [EMAIL PROTECTED]);
@@ -708,7 +708,7 @@
keywords.Add ("synchronized", Token.Type.synchronized);
keywords.Add ("class", [EMAIL PROTECTED]);
keywords.Add ("float", [EMAIL PROTECTED]);
- keywords.Add ("package", Token.Type.packate);
+ keywords.Add ("packate", Token.Type.packate);
keywords.Add ("throws", Token.Type.throws);
keywords.Add ("const", [EMAIL PROTECTED]);
keywords.Add ("goto", [EMAIL PROTECTED]);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
