|
@@ -913,7 +913,7 @@ namespace NTERA.Engine.Compiler
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
- if (char.IsWhiteSpace(Lexer.CurrentChar))
|
|
|
|
|
|
+ if (char.IsWhiteSpace(Lexer.CurrentChar) && Lexer.CurrentChar != '\n')
|
|
Lexer.GetNextChar();
|
|
Lexer.GetNextChar();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -952,7 +952,10 @@ namespace NTERA.Engine.Compiler
|
|
if (Lexer.CurrentChar == '@')
|
|
if (Lexer.CurrentChar == '@')
|
|
{
|
|
{
|
|
if (nestedTernary)
|
|
if (nestedTernary)
|
|
|
|
+ {
|
|
|
|
+ Lexer.GetNextChar();
|
|
break;
|
|
break;
|
|
|
|
+ }
|
|
|
|
|
|
var expressionValue = Expression(out error, true, true);
|
|
var expressionValue = Expression(out error, true, true);
|
|
if (error != null)
|
|
if (error != null)
|
|
@@ -963,8 +966,11 @@ namespace NTERA.Engine.Compiler
|
|
value = value == null
|
|
value = value == null
|
|
? expressionValue
|
|
? expressionValue
|
|
: OperateNodes(value, expressionValue, Token.Plus);
|
|
: OperateNodes(value, expressionValue, Token.Plus);
|
|
|
|
+
|
|
|
|
+ continue;
|
|
}
|
|
}
|
|
- else if (Lexer.CurrentChar == 'n')
|
|
|
|
|
|
+
|
|
|
|
+ if (Lexer.CurrentChar == 'n')
|
|
{
|
|
{
|
|
currentBlock.Append('\n');
|
|
currentBlock.Append('\n');
|
|
|
|
|