Skip to content

Commit f027ca1

Browse files
CppCXYCppCXY
committed
增加nameIdentify
1 parent 016f775 commit f027ca1

File tree

8 files changed

+104
-83
lines changed

8 files changed

+104
-83
lines changed

‎3rd/uriparser/src/config.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
#define PACKAGE_VERSION "0.9.5"
4545

46-
#define HAVE_WPRINTF
46+
/* #undef HAVE_WPRINTF */
4747
/* #undef HAVE_REALLOCARRAY */
4848

4949

‎CodeFormatServer/src/Service/ModuleService.cpp‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ class UnResolveModuleFinder : public LuaAstVisitor
1010
std::set<std::string, std::less<>> LocalVariableSet;
1111
};
1212

13-
UnResolveModuleFinder(std::vector<vscode::Diagnostic>& result, std::shared_ptr<LuaCodeStyleOptions> options)
14-
: _result(result),
15-
_options(options)
16-
{
17-
}
13+
// UnResolveModuleFinder(std::shared_ptr<LuaCodeStyleOptions> options)
14+
// : _options(options)
15+
// {
16+
// }
1817

1918
void Find()
2019
{
@@ -34,32 +33,27 @@ class UnResolveModuleFinder : public LuaAstVisitor
3433
{
3534
}
3635

37-
void VisitExpression(const std::shared_ptr<LuaAstNode>& expression) override
36+
void VisitNameIdentify(const std::shared_ptr<LuaAstNode>& expression) override
3837
{
39-
if(expression->GetChildren().empty())
40-
switch (expression->GetType())
41-
{
42-
// case
43-
44-
45-
46-
}
47-
38+
// if(IsGlobal(expression))
39+
// {
40+
//
41+
// }
4842
}
4943

5044
private:
51-
std::vector<vscode::Diagnostic>& _result;
45+
std::vector<std::shared_ptr<LuaAstNode>>& _result;
5246
std::shared_ptr<LuaCodeStyleOptions> _options;
5347
};
5448

5549
std::vector<vscode::Diagnostic> ModuleService::GetModuleDiagnostics(std::shared_ptr<LuaParser> parser,
5650
std::shared_ptr<LuaCodeStyleOptions> options)
5751
{
5852
std::vector<vscode::Diagnostic> result;
59-
UnResolveModuleFinder finder(result, options);
60-
auto ast = parser->GetAst();
61-
62-
ast->AcceptChildren(finder);
53+
// UnResolveModuleFinder finder(options);
54+
// auto ast = parser->GetAst();
55+
//
56+
// ast->AcceptChildren(finder);
6357

6458
return result;
6559
}

‎CodeService/src/LuaFormatter.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,10 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatNode(std::shared_ptr<LuaAstNo
150150
{
151151
return FormatIdentify(node);
152152
}
153+
case LuaAstNodeType::NameIdentify:
154+
{
155+
return FormatNameIdentify(node);
156+
}
153157
case LuaAstNodeType::GeneralOperator:
154158
{
155159
return FormatGeneralOperator(node);
@@ -692,6 +696,11 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatIdentify(std::shared_ptr<LuaA
692696
return std::make_shared<TextElement>(identify);
693697
}
694698

699+
std::shared_ptr<FormatElement> LuaFormatter::FormatNameIdentify(std::shared_ptr<LuaAstNode> nameIdentify)
700+
{
701+
return std::make_shared<TextElement>(nameIdentify);
702+
}
703+
695704
std::shared_ptr<FormatElement> LuaFormatter::FormatGeneralOperator(std::shared_ptr<LuaAstNode> general)
696705
{
697706
return std::make_shared<TextElement>(general);
@@ -1821,6 +1830,7 @@ std::shared_ptr<FormatElement> LuaFormatter::FormatPrimaryExpression(std::shared
18211830
}
18221831
case LuaAstNodeType::Expression:
18231832
case LuaAstNodeType::Identify:
1833+
case LuaAstNodeType::NameIdentify:
18241834
{
18251835
env->AddChild(FormatNode(child));
18261836
env->Add<KeepElement>(0);

‎LuaParser/src/LuaAstVisitor.cpp‎

Lines changed: 70 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -25,161 +25,166 @@ void LuaAstVisitor::Visit(std::shared_ptr<LuaAstNode> node)
2525
}
2626
case LuaAstNodeType::ExpressionList:
2727
{
28-
VisitExpressionList(node);
29-
break;
28+
VisitExpressionList(node);
29+
break;
3030
}
3131
case LuaAstNodeType::Comment:
3232
{
33-
VisitComment(node);
34-
break;
33+
VisitComment(node);
34+
break;
3535
}
3636
case LuaAstNodeType::LabelStatement:
3737
{
38-
VisitLabelStatement(node);
39-
break;
38+
VisitLabelStatement(node);
39+
break;
4040
}
4141
case LuaAstNodeType::BreakStatement:
4242
{
43-
VisitBreakStatement(node);
44-
break;
43+
VisitBreakStatement(node);
44+
break;
4545
}
4646
case LuaAstNodeType::GotoStatement:
4747
{
48-
VisitGotoStatement(node);
49-
break;
48+
VisitGotoStatement(node);
49+
break;
5050
}
5151
case LuaAstNodeType::ReturnStatement:
5252
{
53-
VisitReturnStatement(node);
54-
break;
53+
VisitReturnStatement(node);
54+
break;
5555
}
5656
case LuaAstNodeType::Identify:
5757
{
58-
VisitIdentify(node);
59-
break;
58+
VisitIdentify(node);
59+
break;
60+
}
61+
case LuaAstNodeType::NameIdentify:
62+
{
63+
VisitNameIdentify(node);
64+
break;
6065
}
6166
case LuaAstNodeType::GeneralOperator:
6267
{
63-
VisitGeneralOperator(node);
64-
break;
68+
VisitGeneralOperator(node);
69+
break;
6570
}
6671
case LuaAstNodeType::KeyWord:
6772
{
68-
VisitKeyWords(node);
69-
break;
73+
VisitKeyWords(node);
74+
break;
7075
}
7176
case LuaAstNodeType::WhileStatement:
7277
{
73-
VisitWhileStatement(node);
74-
break;
78+
VisitWhileStatement(node);
79+
break;
7580
}
7681
case LuaAstNodeType::ForStatement:
7782
{
78-
VisitForStatement(node);
79-
break;
83+
VisitForStatement(node);
84+
break;
8085
}
8186
case LuaAstNodeType::ForBody:
8287
{
83-
VisitForBody(node);
84-
break;
88+
VisitForBody(node);
89+
break;
8590
}
8691
case LuaAstNodeType::Attribute:
8792
{
88-
VisitAttribute(node);
89-
break;
93+
VisitAttribute(node);
94+
break;
9095
}
9196
case LuaAstNodeType::RepeatStatement:
9297
{
93-
VisitRepeatStatement(node);
94-
break;
98+
VisitRepeatStatement(node);
99+
break;
95100
}
96101
case LuaAstNodeType::DoStatement:
97102
{
98-
VisitDoStatement(node);
99-
break;
103+
VisitDoStatement(node);
104+
break;
100105
}
101106
case LuaAstNodeType::AssignStatement:
102107
{
103-
VisitAssignment(node);
104-
break;
108+
VisitAssignment(node);
109+
break;
105110
}
106111
case LuaAstNodeType::IfStatement:
107112
{
108-
VisitIfStatement(node);
109-
break;
113+
VisitIfStatement(node);
114+
break;
110115
}
111116
case LuaAstNodeType::ExpressionStatement:
112117
{
113-
VisitExpressionStatement(node);
114-
break;
118+
VisitExpressionStatement(node);
119+
break;
115120
}
116121
case LuaAstNodeType::Expression:
117122
{
118-
VisitExpression(node);
119-
break;
123+
VisitExpression(node);
124+
break;
120125
}
121126
case LuaAstNodeType::CallExpression:
122127
{
123-
VisitCallExpression(node);
124-
break;
128+
VisitCallExpression(node);
129+
break;
125130
}
126131
case LuaAstNodeType::CallArgList:
127132
{
128-
VisitCallArgList(node);
129-
break;
133+
VisitCallArgList(node);
134+
break;
130135
}
131136
case LuaAstNodeType::FunctionStatement:
132137
{
133-
VisitFunctionStatement(node);
134-
break;
138+
VisitFunctionStatement(node);
139+
break;
135140
}
136141
case LuaAstNodeType::LocalFunctionStatement:
137142
{
138-
VisitLocalFunctionStatement(node);
139-
break;
143+
VisitLocalFunctionStatement(node);
144+
break;
140145
}
141146
case LuaAstNodeType::ClosureExpression:
142147
{
143-
VisitClosureExpression(node);
144-
break;
148+
VisitClosureExpression(node);
149+
break;
145150
}
146151
case LuaAstNodeType::NameExpression:
147152
{
148-
VisitNameExpression(node);
149-
break;
153+
VisitNameExpression(node);
154+
break;
150155
}
151156
case LuaAstNodeType::TableExpression:
152157
{
153-
VisitTableExpression(node);
154-
break;
158+
VisitTableExpression(node);
159+
break;
155160
}
156161
case LuaAstNodeType::TableField:
157162
{
158-
VisitTableField(node);
159-
break;
163+
VisitTableField(node);
164+
break;
160165
}
161166
case LuaAstNodeType::ParamList:
162167
{
163-
VisitParamList(node);
164-
break;
168+
VisitParamList(node);
169+
break;
165170
}
166171
case LuaAstNodeType::FunctionBody:
167172
{
168-
VisitFunctionBody(node);
169-
break;
173+
VisitFunctionBody(node);
174+
break;
170175
}
171176
case LuaAstNodeType::LiteralExpression:
172177
{
173-
VisitLiteralExpression(node);
174-
break;
178+
VisitLiteralExpression(node);
179+
break;
175180
}
176181
default:
177182
{
178183
break;
179184
}
180185
}
181186

182-
for(const auto& child: node->GetChildren())
187+
for (const auto& child : node->GetChildren())
183188
{
184189
Visit(child);
185190
}
@@ -225,6 +230,10 @@ void LuaAstVisitor::VisitIdentify(const std::shared_ptr<LuaAstNode>& node)
225230
{
226231
}
227232

233+
void LuaAstVisitor::VisitNameIdentify(const std::shared_ptr<LuaAstNode>& node)
234+
{
235+
}
236+
228237
void LuaAstVisitor::VisitGeneralOperator(const std::shared_ptr<LuaAstNode>& node)
229238
{
230239
}

‎LuaParser/src/LuaParser.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,10 @@ void LuaParser::PrimaryExpression(std::shared_ptr<LuaAstNode> primaryExpression)
10561056
}
10571057
case TK_NAME:
10581058
{
1059-
CodeName(primaryExpression);
1059+
auto identify = CreateAstNodeFromCurrentToken(LuaAstNodeType::NameIdentify);
1060+
primaryExpression->AddChild(identify);
1061+
_tokenParser->Next();
1062+
// CodeName(primaryExpression);
10601063
return;
10611064
}
10621065
default:

‎include/CodeService/LuaFormatter.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ class LuaFormatter
5050

5151
std::shared_ptr<FormatElement> FormatIdentify(std::shared_ptr<LuaAstNode> identify);
5252

53+
std::shared_ptr<FormatElement> FormatNameIdentify(std::shared_ptr<LuaAstNode> nameIdentify);
54+
5355
std::shared_ptr<FormatElement> FormatGeneralOperator(std::shared_ptr<LuaAstNode> general);
5456

5557
std::shared_ptr<FormatElement> FormatKeyWords(std::shared_ptr<LuaAstNode> keywords);

‎include/LuaParser/LuaAstNodeType.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ enum class LuaAstNodeType
88

99
Identify,
1010

11+
NameIdentify,
12+
1113
KeyWord,
1214

1315
EmptyStatement,

‎include/LuaParser/LuaAstVisitor.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class LuaAstVisitor
2020
virtual void VisitGotoStatement(const std::shared_ptr<LuaAstNode>& node);
2121
virtual void VisitReturnStatement(const std::shared_ptr<LuaAstNode>& node);
2222
virtual void VisitIdentify(const std::shared_ptr<LuaAstNode>& node);
23+
virtual void VisitNameIdentify(const std::shared_ptr<LuaAstNode>& node);
2324
virtual void VisitGeneralOperator(const std::shared_ptr<LuaAstNode>& node);
2425
virtual void VisitKeyWords(const std::shared_ptr<LuaAstNode>& node);
2526
virtual void VisitWhileStatement(const std::shared_ptr<LuaAstNode>& node);

0 commit comments

Comments
 (0)