var...
This commit is contained in:
@@ -86,7 +86,7 @@ public class Lexer
|
||||
|
||||
if (buffer is "true" or "false")
|
||||
{
|
||||
return new LiteralToken(NubType.Bool, buffer);
|
||||
return new LiteralToken(NubPrimitiveType.Bool, buffer);
|
||||
}
|
||||
|
||||
return new IdentifierToken(buffer);
|
||||
@@ -103,7 +103,7 @@ public class Lexer
|
||||
current = Peek();
|
||||
}
|
||||
|
||||
return new LiteralToken(NubType.Int64, buffer);
|
||||
return new LiteralToken(NubPrimitiveType.I64, buffer);
|
||||
}
|
||||
|
||||
// TODO: Revisit this
|
||||
@@ -148,7 +148,7 @@ public class Lexer
|
||||
buffer += current.Value;
|
||||
}
|
||||
|
||||
return new LiteralToken(NubType.String, buffer);
|
||||
return new LiteralToken(NubPrimitiveType.String, buffer);
|
||||
}
|
||||
|
||||
if (char.IsWhiteSpace(current.Value))
|
||||
|
||||
@@ -20,12 +20,7 @@ public class Parser
|
||||
{
|
||||
if (TryExpectSymbol(Symbol.Import))
|
||||
{
|
||||
var name = ExpectLiteral();
|
||||
if (!name.Type.Equals(NubType.String))
|
||||
{
|
||||
throw new Exception("Import statements must have a string literal value");
|
||||
}
|
||||
|
||||
var name = ExpectIdentifier();
|
||||
TryExpectSymbol(Symbol.Semicolon);
|
||||
imports.Add(name.Value);
|
||||
}
|
||||
@@ -466,7 +461,7 @@ public class Parser
|
||||
private NubType ParseType()
|
||||
{
|
||||
var name = ExpectIdentifier().Value;
|
||||
return new NubType(name);
|
||||
return NubType.Parse(name);
|
||||
}
|
||||
|
||||
private Token ExpectToken()
|
||||
|
||||
@@ -197,7 +197,7 @@ public class ExpressionTyper
|
||||
case BinaryExpressionOperator.LessThan:
|
||||
case BinaryExpressionOperator.LessThanOrEqual:
|
||||
{
|
||||
binaryExpression.Type = new NubType("bool");
|
||||
binaryExpression.Type = NubPrimitiveType.Bool;
|
||||
break;
|
||||
}
|
||||
case BinaryExpressionOperator.Plus:
|
||||
|
||||
Reference in New Issue
Block a user