Merge branch 'main' of https://github.com/pigpigyyy/Yuescript

4 files changed, 9 insertions, 6 deletions

diff --git a/spec/inputs/string.yue b/spec/inputs/string.yue
index e21ae84..201e60d 100644
--- a/spec/inputs/string.yue
+++ b/spec/inputs/string.yue
@@ -33,6 +33,8 @@ nil
 Fail to compile
 ]]
 
+txt[ [[abc]]] = [["#{i}" for i = 1, 10] for i = 1, 10]]
+
 oo = ""
 
 x = "\\"
diff --git a/spec/outputs/string.lua b/spec/outputs/string.lua
index 84b6700..87ecf2c 100644
--- a/spec/outputs/string.lua
+++ b/spec/outputs/string.lua
@@ -17,6 +17,7 @@ local txt = [[
 nil
 Fail to compile
 ]]
+txt[ [[abc]]] = [["#{i}" for i = 1, 10] for i = 1, 10]]
 local oo = ""
 local x = "\\"
 x = "a\\b"
diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index b9b51bf..d270455 100755
--- a/src/yuescript/yue_compiler.cpp
+++ b/src/yuescript/yue_compiler.cpp
@@ -56,7 +56,7 @@ using namespace parserlib;
 
 typedef std::list<std::string> str_list;
 
-const std::string_view version = "0.10.25"sv;
+const std::string_view version = "0.11.0"sv;
 const std::string_view extension = "yue"sv;
 
 class YueCompilerImpl {
diff --git a/src/yuescript/yue_parser.cpp b/src/yuescript/yue_parser.cpp
index ef414d4..54dd174 100755
--- a/src/yuescript/yue_parser.cpp
+++ b/src/yuescript/yue_parser.cpp
@@ -305,7 +305,7 @@ YueParser::YueParser() {
         catch_block = Break >> *EmptyLine >> CheckIndent >> Space >> key("catch") >> Space >> Variable >> InBlock;
         Try = Space >> key("try") >> (InBlock | Exp) >> -catch_block;
 
-        Comprehension = sym('[') >> Exp >> Space >> CompInner >> sym(']');
+        Comprehension = sym('[') >> not_('[') >> Exp >> Space >> CompInner >> sym(']');
         comp_value = sym(',') >> Exp;
         TblComprehension = sym('{') >> Exp >> -comp_value >> Space >> CompInner >> sym('}');
 
@@ -446,7 +446,7 @@ YueParser::YueParser() {
         chain_with_colon = +ChainItem >> -ColonChain;
         ChainItems = chain_with_colon | ColonChain;
 
-        Index = symx('[') >> Exp >> sym(']');
+        Index = symx('[') >> not_('[') >> Exp >> sym(']');
         ChainItem = Invoke >> -existential_op | DotChainItem >> -existential_op | Slice | Index >> -existential_op;
         DotChainItem = symx('.') >> (Name >> not_('#') | Metatable | Metamethod);
         ColonChainItem = (expr('\\') | expr("::")) >> ((LuaKeyword | Name) >> not_('#') | Metamethod);
@@ -455,7 +455,7 @@ YueParser::YueParser() {
 
         default_value = true_();
         Slice =
-                symx('[') >>
+                symx('[') >> not_('[') >>
                 (Exp | default_value) >>
                 sym(',') >>
                 (Exp | default_value) >>
@@ -537,7 +537,7 @@ YueParser::YueParser() {
 
         normal_pair = (
                 KeyName |
-                sym('[') >> Exp >> sym(']') |
+                sym('[') >> not_('[') >> Exp >> sym(']') |
                 Space >> DoubleString |
                 Space >> SingleString |
                 Space >> LuaString
@@ -549,7 +549,7 @@ YueParser::YueParser() {
 
         meta_variable_pair = sym(':') >> Variable >> expr('#');
 
-        meta_normal_pair = Space >> -(Name | symx('[') >> Exp >> sym(']')) >> expr("#:") >>
+        meta_normal_pair = Space >> -(Name | symx('[') >> not_('[') >> Exp >> sym(']')) >> expr("#:") >>
                 (Exp | TableBlock | +(SpaceBreak) >> Exp);
 
         meta_default_pair = (sym(':') >> Variable >> expr('#') >> Seperator | Space >> -Name >> expr("#:") >> Seperator >> Exp) >> sym('=') >> Exp;