diff options
| author | Li Jin <dragon-fly@qq.com> | 2021-11-23 09:34:46 +0800 |
|---|---|---|
| committer | Li Jin <dragon-fly@qq.com> | 2021-11-23 09:34:57 +0800 |
| commit | 65050db97932197ce990f36fc0efed8d0c1298a2 (patch) | |
| tree | c3b8d0d941438cb6bd308b0d4ce08ecf389da821 /src | |
| parent | 825b5d96f8a0d146615f0c6a76feab46da9baa60 (diff) | |
| download | yuescript-65050db97932197ce990f36fc0efed8d0c1298a2.tar.gz yuescript-65050db97932197ce990f36fc0efed8d0c1298a2.tar.bz2 yuescript-65050db97932197ce990f36fc0efed8d0c1298a2.zip | |
fix an indent issue. add more macro specs. fixing issue #69.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/yuescript/yue_compiler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp index b3f6bdd..d4996a7 100755 --- a/src/yuescript/yue_compiler.cpp +++ b/src/yuescript/yue_compiler.cpp | |||
| @@ -60,7 +60,7 @@ using namespace parserlib; | |||
| 60 | 60 | ||
| 61 | typedef std::list<std::string> str_list; | 61 | typedef std::list<std::string> str_list; |
| 62 | 62 | ||
| 63 | const std::string_view version = "0.9.1"sv; | 63 | const std::string_view version = "0.9.2"sv; |
| 64 | const std::string_view extension = "yue"sv; | 64 | const std::string_view extension = "yue"sv; |
| 65 | 65 | ||
| 66 | class YueCompilerImpl { | 66 | class YueCompilerImpl { |
| @@ -3974,7 +3974,7 @@ private: | |||
| 3974 | if (name == "LINE"sv) { | 3974 | if (name == "LINE"sv) { |
| 3975 | return std::to_string(x->m_begin.m_line + _config.lineOffset); | 3975 | return std::to_string(x->m_begin.m_line + _config.lineOffset); |
| 3976 | } | 3976 | } |
| 3977 | if (name == "MODULE"sv) { | 3977 | if (name == "FILE"sv) { |
| 3978 | return _config.module.empty() ? "\"yuescript\""s : '"' + _config.module + '"'; | 3978 | return _config.module.empty() ? "\"yuescript\""s : '"' + _config.module + '"'; |
| 3979 | } | 3979 | } |
| 3980 | return Empty; | 3980 | return Empty; |
| @@ -6255,8 +6255,8 @@ private: | |||
| 6255 | str_list temp; | 6255 | str_list temp; |
| 6256 | if (expList) { | 6256 | if (expList) { |
| 6257 | temp.push_back(indent() + "do"s + nll(whileNode)); | 6257 | temp.push_back(indent() + "do"s + nll(whileNode)); |
| 6258 | pushScope(); | ||
| 6258 | } | 6259 | } |
| 6259 | pushScope(); | ||
| 6260 | auto accumVar = getUnusedName("_accum_"sv); | 6260 | auto accumVar = getUnusedName("_accum_"sv); |
| 6261 | addToScope(accumVar); | 6261 | addToScope(accumVar); |
| 6262 | auto lenVar = getUnusedName("_len_"sv); | 6262 | auto lenVar = getUnusedName("_len_"sv); |
| @@ -6279,10 +6279,10 @@ private: | |||
| 6279 | assignment->expList.set(expList); | 6279 | assignment->expList.set(expList); |
| 6280 | assignment->action.set(assign); | 6280 | assignment->action.set(assign); |
| 6281 | transformAssignment(assignment, temp); | 6281 | transformAssignment(assignment, temp); |
| 6282 | popScope(); | ||
| 6282 | } else { | 6283 | } else { |
| 6283 | temp.push_back(indent() + "return "s + accumVar + nlr(whileNode)); | 6284 | temp.push_back(indent() + "return "s + accumVar + nlr(whileNode)); |
| 6284 | } | 6285 | } |
| 6285 | popScope(); | ||
| 6286 | if (expList) { | 6286 | if (expList) { |
| 6287 | temp.push_back(indent() + "end"s + nlr(whileNode)); | 6287 | temp.push_back(indent() + "end"s + nlr(whileNode)); |
| 6288 | } | 6288 | } |