Skip to content

Commit ec2cd0e

Browse files
committed
fix #65
1 parent 3fefe6e commit ec2cd0e

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

CodeService/src/FormatElement/AlignToFirstElement.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ void AlignToFirstElement::Serialize(SerializeContext& ctx, ChildIterator selfIt,
3838
{
3939
if (writeCount > indentState.TabIndent)
4040
{
41-
indentState.SpaceIndent += writeCount - indentState.TabIndent;
41+
indentState.SpaceIndent = writeCount - indentState.TabIndent;
4242
}
4343
else
4444
{

LuaParser/src/LuaParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ void LuaParser::SimpleExpression(std::shared_ptr<LuaAstNode> expressionNode)
779779
switch (_tokenParser->Current().TokenType)
780780
{
781781
case TK_FLT:
782-
case TK_INT:
782+
case TK_NUMBER:
783783
case TK_NIL:
784784
case TK_TRUE:
785785
case TK_FALSE:

LuaParser/src/LuaTokenParser.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ LuaTokenType LuaTokenParser::ReadNumeral()
621621
{
622622
if (CheckNext1('L') && CheckNext1('L'))
623623
{
624-
return TK_INT;
624+
return TK_NUMBER;
625625
}
626626
else
627627
{
@@ -634,9 +634,7 @@ LuaTokenType LuaTokenParser::ReadNumeral()
634634
}
635635
}
636636

637-
// todo error format check
638-
// 实际上应该是TK_NUMBER
639-
return TK_INT;
637+
return TK_NUMBER;
640638
}
641639

642640
/*

include/LuaParser/LuaTokenTypeDetail.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ enum LuaTokenTypeDetail : int
4242
TK_DBCOLON,
4343
TK_EOS,
4444
TK_FLT,
45-
TK_INT,
45+
TK_NUMBER,
4646
TK_NAME,
4747
TK_STRING,
4848
// custom

0 commit comments

Comments
 (0)