pytest-dsl 0.5.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

pytest_dsl/core/lexer.py

@@ -13,7 +13,9 @@ reserved = {
     'return': 'RETURN',  # 添加return关键字支持
     'else': 'ELSE',   # 添加else关键字支持
     'if': 'IF',  # 添加if关键字支持
-    'as': 'AS'   # 添加as关键字支持，用于远程关键字别名
+    'as': 'AS',   # 添加as关键字支持，用于远程关键字别名
+    'function': 'FUNCTION',  # 添加function关键字支持，用于自定义关键字定义
+    'teardown': 'TEARDOWN'   # 添加teardown关键字支持，用于清理操作
 }
 
 # token 名称列表
@@ -35,9 +37,7 @@ tokens = [
     'TAGS_KEYWORD',
     'AUTHOR_KEYWORD',
     'DATE_KEYWORD',
-    'TEARDOWN_KEYWORD',
     'DATA_KEYWORD',  # Add new token for @data keyword
-    'KEYWORD_KEYWORD',  # 添加@keyword关键字
     'IMPORT_KEYWORD',   # 添加@import关键字
     'REMOTE_KEYWORD',   # 添加@remote关键字
     'GT',        # 大于 >
@@ -132,21 +132,11 @@ def t_DATE_KEYWORD(t):
     return t
 
 
-def t_TEARDOWN_KEYWORD(t):
-    r'@teardown'
-    return t
-
-
 def t_DATA_KEYWORD(t):
     r'@data'
     return t
 
 
-def t_KEYWORD_KEYWORD(t):
-    r'@keyword'
-    return t
-
-
 def t_IMPORT_KEYWORD(t):
     r'@import'
     return t

pytest_dsl/core/parser.py

@@ -231,7 +231,7 @@ def p_parameter_item(p):
 
 
 def p_teardown(p):
-    '''teardown : TEARDOWN_KEYWORD DO statements END'''
+    '''teardown : TEARDOWN DO statements END'''
     p[0] = Node('Teardown', [p[3]])
 
 
@@ -241,7 +241,7 @@ def p_data_source(p):
 
 
 def p_custom_keyword(p):
-    '''custom_keyword : KEYWORD_KEYWORD ID LPAREN param_definitions RPAREN DO statements END'''
+    '''custom_keyword : FUNCTION ID LPAREN param_definitions RPAREN DO statements END'''
     p[0] = Node('CustomKeyword', [p[4], p[7]], p[2])
 
 

pytest_dsl/core/parsetab.py

@@ -6,9 +6,9 @@ _tabversion = '3.10'
 
 _lr_method = 'LALR'
 
-_lr_signature = 'leftCOMMAleftGTLTGELEEQNEleftPLUSMINUSleftTIMESDIVIDErightEQUALSAS AUTHOR_KEYWORD COLON COMMA DATA_KEYWORD DATE DATE_KEYWORD DESCRIPTION_KEYWORD DIVIDE DO ELSE END EQ EQUALS FALSE FOR GE GT ID IF IMPORT_KEYWORD IN KEYWORD_KEYWORD LBRACKET LE LPAREN LT MINUS NAME_KEYWORD NE NUMBER PIPE PLACEHOLDER PLUS RANGE RBRACKET REMOTE_KEYWORD RETURN RPAREN STRING TAGS_KEYWORD TEARDOWN_KEYWORD TIMES TRUE USINGstart : metadata statements teardown\n             | metadata statements\n             | statements teardown\n             | statementsmetadata : metadata_items\n                | emptyempty :metadata_items : metadata_item metadata_items\n                     | metadata_itemmetadata_item : NAME_KEYWORD COLON metadata_value\n                    | DESCRIPTION_KEYWORD COLON metadata_value\n                    | TAGS_KEYWORD COLON LBRACKET tags RBRACKET\n                    | AUTHOR_KEYWORD COLON metadata_value\n                    | DATE_KEYWORD COLON DATE\n                    | DATA_KEYWORD COLON data_source\n                    | IMPORT_KEYWORD COLON STRING\n                    | REMOTE_KEYWORD COLON STRING AS IDmetadata_value : STRING\n                     | IDtags : tag COMMA tags\n            | tagtag : STRING\n           | IDstatements : statement statements\n                  | statementstatement : assignment\n                | keyword_call\n                | remote_keyword_call\n                | loop\n                | custom_keyword\n                | return_statement\n                | if_statementassignment : ID EQUALS expression\n                 | ID EQUALS keyword_call\n                 | ID EQUALS remote_keyword_callexpression : expr_atom\n                  | comparison_expr\n                  | arithmetic_exprexpr_atom : NUMBER\n                 | STRING\n                 | PLACEHOLDER\n                 | ID\n                 | boolean_expr\n                 | list_expr\n                 | LPAREN expression RPARENboolean_expr : TRUE\n                    | FALSElist_expr : LBRACKET list_items RBRACKET\n                 | LBRACKET RBRACKETlist_items : list_item\n                  | list_item COMMA list_itemslist_item : expressionloop : FOR ID IN RANGE LPAREN expression COMMA expression RPAREN DO statements ENDkeyword_call : LBRACKET ID RBRACKET COMMA parameter_list\n                   | LBRACKET ID RBRACKETparameter_list : parameter_itemsparameter_items : parameter_item COMMA parameter_items\n                     | parameter_itemparameter_item : ID COLON expressionteardown : TEARDOWN_KEYWORD DO statements ENDdata_source : STRING USING IDcustom_keyword : KEYWORD_KEYWORD ID LPAREN param_definitions RPAREN DO statements ENDparam_definitions : param_def_list\n                        | param_def_list : param_def COMMA param_def_list\n                     | param_defparam_def : ID EQUALS STRING\n                | ID EQUALS NUMBER\n                | IDreturn_statement : RETURN expressionif_statement : IF expression DO statements END\n                   | IF expression DO statements ELSE statements ENDcomparison_expr : expr_atom GT expr_atom\n                      | expr_atom LT expr_atom\n                      | expr_atom GE expr_atom\n                      | expr_atom LE expr_atom\n                      | expr_atom EQ expr_atom\n                      | expr_atom NE expr_atomarithmetic_expr : expression PLUS expression\n                       | expression MINUS expression\n                       | expression TIMES expression\n                       | expression DIVIDE expressionremote_keyword_call : ID PIPE LBRACKET ID RBRACKET COMMA parameter_list\n                          | ID PIPE LBRACKET ID RBRACKET'
+_lr_signature = 'leftCOMMAleftGTLTGELEEQNEleftPLUSMINUSleftTIMESDIVIDErightEQUALSAS AUTHOR_KEYWORD COLON COMMA DATA_KEYWORD DATE DATE_KEYWORD DESCRIPTION_KEYWORD DIVIDE DO ELSE END EQ EQUALS FALSE FOR FUNCTION GE GT ID IF IMPORT_KEYWORD IN LBRACKET LE LPAREN LT MINUS NAME_KEYWORD NE NUMBER PIPE PLACEHOLDER PLUS RANGE RBRACKET REMOTE_KEYWORD RETURN RPAREN STRING TAGS_KEYWORD TEARDOWN TIMES TRUE USINGstart : metadata statements teardown\n             | metadata statements\n             | statements teardown\n             | statementsmetadata : metadata_items\n                | emptyempty :metadata_items : metadata_item metadata_items\n                     | metadata_itemmetadata_item : NAME_KEYWORD COLON metadata_value\n                    | DESCRIPTION_KEYWORD COLON metadata_value\n                    | TAGS_KEYWORD COLON LBRACKET tags RBRACKET\n                    | AUTHOR_KEYWORD COLON metadata_value\n                    | DATE_KEYWORD COLON DATE\n                    | DATA_KEYWORD COLON data_source\n                    | IMPORT_KEYWORD COLON STRING\n                    | REMOTE_KEYWORD COLON STRING AS IDmetadata_value : STRING\n                     | IDtags : tag COMMA tags\n            | tagtag : STRING\n           | IDstatements : statement statements\n                  | statementstatement : assignment\n                | keyword_call\n                | remote_keyword_call\n                | loop\n                | custom_keyword\n                | return_statement\n                | if_statementassignment : ID EQUALS expression\n                 | ID EQUALS keyword_call\n                 | ID EQUALS remote_keyword_callexpression : expr_atom\n                  | comparison_expr\n                  | arithmetic_exprexpr_atom : NUMBER\n                 | STRING\n                 | PLACEHOLDER\n                 | ID\n                 | boolean_expr\n                 | list_expr\n                 | LPAREN expression RPARENboolean_expr : TRUE\n                    | FALSElist_expr : LBRACKET list_items RBRACKET\n                 | LBRACKET RBRACKETlist_items : list_item\n                  | list_item COMMA list_itemslist_item : expressionloop : FOR ID IN RANGE LPAREN expression COMMA expression RPAREN DO statements ENDkeyword_call : LBRACKET ID RBRACKET COMMA parameter_list\n                   | LBRACKET ID RBRACKETparameter_list : parameter_itemsparameter_items : parameter_item COMMA parameter_items\n                     | parameter_itemparameter_item : ID COLON expressionteardown : TEARDOWN DO statements ENDdata_source : STRING USING IDcustom_keyword : FUNCTION ID LPAREN param_definitions RPAREN DO statements ENDparam_definitions : param_def_list\n                        | param_def_list : param_def COMMA param_def_list\n                     | param_defparam_def : ID EQUALS STRING\n                | ID EQUALS NUMBER\n                | IDreturn_statement : RETURN expressionif_statement : IF expression DO statements END\n                   | IF expression DO statements ELSE statements ENDcomparison_expr : expr_atom GT expr_atom\n                      | expr_atom LT expr_atom\n                      | expr_atom GE expr_atom\n                      | expr_atom LE expr_atom\n                      | expr_atom EQ expr_atom\n                      | expr_atom NE expr_atomarithmetic_expr : expression PLUS expression\n                       | expression MINUS expression\n                       | expression TIMES expression\n                       | expression DIVIDE expressionremote_keyword_call : ID PIPE LBRACKET ID RBRACKET COMMA parameter_list\n                          | ID PIPE LBRACKET ID RBRACKET'
     
-_lr_action_items = {'ID':([0,2,4,5,6,7,8,9,10,11,12,13,14,18,25,26,27,28,33,34,35,38,43,47,48,49,50,51,52,53,54,55,56,57,58,59,60,63,64,65,66,67,68,69,70,71,72,74,76,77,78,79,80,81,83,84,85,86,87,88,89,90,91,92,93,96,99,105,106,107,115,116,117,118,119,120,121,122,123,124,125,126,127,130,131,133,134,135,136,137,138,139,142,144,145,147,148,149,153,156,157,158,159,161,163,165,167,],[24,24,-5,-6,24,-9,-26,-27,-28,-29,-30,-31,-32,37,45,46,54,54,-8,66,66,66,76,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,54,-46,-47,54,24,-10,-18,-19,-11,104,-55,-13,-14,-15,-16,-42,-33,-34,-35,108,109,111,54,54,54,54,54,54,54,54,54,54,-49,24,132,136,137,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,54,-12,104,-54,-56,-58,-61,-17,-84,54,111,-71,24,54,132,132,24,-59,-57,-83,54,-72,-62,24,-53,]),'LBRACKET':([0,2,4,5,6,7,8,9,10,11,12,13,14,27,28,33,36,43,44,47,48,49,50,51,52,53,54,55,56,57,58,59,60,63,64,65,66,67,69,70,71,72,74,76,77,78,79,80,84,85,86,87,88,89,90,91,92,93,96,99,115,116,117,118,119,120,121,122,123,124,125,126,127,130,133,134,135,136,137,138,139,144,145,147,153,156,157,158,159,161,163,165,167,],[18,18,-5,-6,18,-9,-26,-27,-28,-29,-30,-31,-32,60,60,-8,68,80,81,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,60,-46,-47,60,18,-10,-18,-19,-11,-55,-13,-14,-15,-16,-42,-33,-34,-35,60,60,60,60,60,60,60,60,60,60,60,-49,18,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,60,-12,-54,-56,-58,-61,-17,-84,60,-71,18,60,18,-59,-57,-83,60,-72,-62,18,-53,]),'FOR':([0,2,4,5,6,7,8,9,10,11,12,13,14,33,47,48,49,50,51,52,53,54,55,56,58,59,63,64,65,66,67,69,70,71,72,74,76,77,78,79,96,99,115,116,117,118,119,120,121,122,123,124,125,126,130,133,134,135,136,137,138,144,145,153,156,157,158,161,163,165,167,],[25,25,-5,-6,25,-9,-26,-27,-28,-29,-30,-31,-32,-8,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,25,-10,-18,-19,-11,-55,-13,-14,-15,-16,-42,-33,-34,-35,-49,25,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,-12,-54,-56,-58,-61,-17,-84,-71,25,25,-59,-57,-83,-72,-62,25,-53,]),'KEYWORD_KEYWORD':([0,2,4,5,6,7,8,9,10,11,12,13,14,33,47,48,49,50,51,52,53,54,55,56,58,59,63,64,65,66,67,69,70,71,72,74,76,77,78,79,96,99,115,116,117,118,119,120,121,122,123,124,125,126,130,133,134,135,136,137,138,144,145,153,156,157,158,161,163,165,167,],[26,26,-5,-6,26,-9,-26,-27,-28,-29,-30,-31,-32,-8,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,26,-10,-18,-19,-11,-55,-13,-14,-15,-16,-42,-33,-34,-35,-49,26,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,-12,-54,-56,-58,-61,-17,-84,-71,26,26,-59,-57,-83,-72,-62,26,-53,]),'RETURN':([0,2,4,5,6,7,8,9,10,11,12,13,14,33,47,48,49,50,51,52,53,54,55,56,58,59,63,64,65,66,67,69,70,71,72,74,76,77,78,79,96,99,115,116,117,118,119,120,121,122,123,124,125,126,130,133,134,135,136,137,138,144,145,153,156,157,158,161,163,165,167,],[27,27,-5,-6,27,-9,-26,-27,-28,-29,-30,-31,-32,-8,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,27,-10,-18,-19,-11,-55,-13,-14,-15,-16,-42,-33,-34,-35,-49,27,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,-12,-54,-56,-58,-61,-17,-84,-71,27,27,-59,-57,-83,-72,-62,27,-53,]),'IF':([0,2,4,5,6,7,8,9,10,11,12,13,14,33,47,48,49,50,51,52,53,54,55,56,58,59,63,64,65,66,67,69,70,71,72,74,76,77,78,79,96,99,115,116,117,118,119,120,121,122,123,124,125,126,130,133,134,135,136,137,138,144,145,153,156,157,158,161,163,165,167,],[28,28,-5,-6,28,-9,-26,-27,-28,-29,-30,-31,-32,-8,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,28,-10,-18,-19,-11,-55,-13,-14,-15,-16,-42,-33,-34,-35,-49,28,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,-12,-54,-56,-58,-61,-17,-84,-71,28,28,-59,-57,-83,-72,-62,28,-53,]),'NAME_KEYWORD':([0,7,64,65,66,67,70,71,72,74,130,136,137,],[15,15,-10,-18,-19,-11,-13,-14,-15,-16,-12,-61,-17,]),'DESCRIPTION_KEYWORD':([0,7,64,65,66,67,70,71,72,74,130,136,137,],[16,16,-10,-18,-19,-11,-13,-14,-15,-16,-12,-61,-17,]),'TAGS_KEYWORD':([0,7,64,65,66,67,70,71,72,74,130,136,137,],[17,17,-10,-18,-19,-11,-13,-14,-15,-16,-12,-61,-17,]),'AUTHOR_KEYWORD':([0,7,64,65,66,67,70,71,72,74,130,136,137,],[19,19,-10,-18,-19,-11,-13,-14,-15,-16,-12,-61,-17,]),'DATE_KEYWORD':([0,7,64,65,66,67,70,71,72,74,130,136,137,],[20,20,-10,-18,-19,-11,-13,-14,-15,-16,-12,-61,-17,]),'DATA_KEYWORD':([0,7,64,65,66,67,70,71,72,74,130,136,137,],[21,21,-10,-18,-19,-11,-13,-14,-15,-16,-12,-61,-17,]),'IMPORT_KEYWORD':([0,7,64,65,66,67,70,71,72,74,130,136,137,],[22,22,-10,-18,-19,-11,-13,-14,-15,-16,-12,-61,-17,]),'REMOTE_KEYWORD':([0,7,64,65,66,67,70,71,72,74,130,136,137,],[23,23,-10,-18,-19,-11,-13,-14,-15,-16,-12,-61,-17,]),'$end':([1,3,6,8,9,10,11,12,13,14,29,30,32,47,48,49,50,51,52,53,54,55,56,58,59,62,69,76,77,78,79,96,115,116,117,118,119,120,121,122,123,124,125,126,129,133,134,135,138,144,156,157,158,161,163,167,],[0,-4,-25,-26,-27,-28,-29,-30,-31,-32,-2,-3,-24,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,-1,-55,-42,-33,-34,-35,-49,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,-60,-54,-56,-58,-84,-71,-59,-57,-83,-72,-62,-53,]),'TEARDOWN_KEYWORD':([3,6,8,9,10,11,12,13,14,29,32,47,48,49,50,51,52,53,54,55,56,58,59,69,76,77,78,79,96,115,116,117,118,119,120,121,122,123,124,125,126,133,134,135,138,144,156,157,158,161,163,167,],[31,-25,-26,-27,-28,-29,-30,-31,-32,31,-24,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,-55,-42,-33,-34,-35,-49,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,-54,-56,-58,-84,-71,-59,-57,-83,-72,-62,-53,]),'END':([6,8,9,10,11,12,13,14,32,47,48,49,50,51,52,53,54,55,56,58,59,69,76,77,78,79,96,100,115,116,117,118,119,120,121,122,123,124,125,126,128,133,134,135,138,144,155,156,157,158,160,161,163,166,167,],[-25,-26,-27,-28,-29,-30,-31,-32,-24,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,-55,-42,-33,-34,-35,-49,129,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,144,-54,-56,-58,-84,-71,161,-59,-57,-83,163,-72,-62,167,-53,]),'ELSE':([6,8,9,10,11,12,13,14,32,47,48,49,50,51,52,53,54,55,56,58,59,69,76,77,78,79,96,115,116,117,118,119,120,121,122,123,124,125,126,128,133,134,135,138,144,156,157,158,161,163,167,],[-25,-26,-27,-28,-29,-30,-31,-32,-24,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,-55,-42,-33,-34,-35,-49,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,145,-54,-56,-58,-84,-71,-59,-57,-83,-72,-62,-53,]),'COLON':([15,16,17,19,20,21,22,23,132,],[34,35,36,38,39,40,41,42,147,]),'EQUALS':([24,111,],[43,140,]),'PIPE':([24,76,],[44,44,]),'NUMBER':([27,28,43,57,60,80,84,85,86,87,88,89,90,91,92,93,127,139,140,147,159,],[51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,152,51,51,]),'STRING':([27,28,34,35,38,40,41,42,43,57,60,68,80,84,85,86,87,88,89,90,91,92,93,127,131,139,140,147,159,],[52,52,65,65,65,73,74,75,52,52,52,103,52,52,52,52,52,52,52,52,52,52,52,52,103,52,151,52,52,]),'PLACEHOLDER':([27,28,43,57,60,80,84,85,86,87,88,89,90,91,92,93,127,139,147,159,],[53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,]),'LPAREN':([27,28,43,46,57,60,80,84,85,86,87,88,89,90,91,92,93,110,127,139,147,159,],[57,57,57,83,57,57,57,57,57,57,57,57,57,57,57,57,57,139,57,57,57,57,]),'TRUE':([27,28,43,57,60,80,84,85,86,87,88,89,90,91,92,93,127,139,147,159,],[58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,]),'FALSE':([27,28,43,57,60,80,84,85,86,87,88,89,90,91,92,93,127,139,147,159,],[59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,]),'DO':([31,48,49,50,51,52,53,54,55,56,58,59,61,96,115,116,117,118,119,120,121,122,123,124,125,126,141,164,],[63,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,99,-49,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,153,165,]),'RBRACKET':([37,48,49,50,51,52,53,54,55,56,58,59,60,80,95,96,97,98,101,102,103,104,108,109,115,116,117,118,119,120,121,122,123,124,125,126,143,146,],[69,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,96,96,126,-49,-50,-52,130,-21,-22,-23,69,138,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,-51,-20,]),'DATE':([39,],[71,]),'IN':([45,],[82,]),'PLUS':([47,48,49,50,51,52,53,54,55,56,58,59,61,76,77,94,96,98,108,115,116,117,118,119,120,121,122,123,124,125,126,150,156,162,],[84,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,84,-42,84,84,-49,84,-42,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,84,84,84,]),'MINUS':([47,48,49,50,51,52,53,54,55,56,58,59,61,76,77,94,96,98,108,115,116,117,118,119,120,121,122,123,124,125,126,150,156,162,],[85,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,85,-42,85,85,-49,85,-42,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,85,85,85,]),'TIMES':([47,48,49,50,51,52,53,54,55,56,58,59,61,76,77,94,96,98,108,115,116,117,118,119,120,121,122,123,124,125,126,150,156,162,],[86,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,86,-42,86,86,-49,86,-42,86,86,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,86,86,86,]),'DIVIDE':([47,48,49,50,51,52,53,54,55,56,58,59,61,76,77,94,96,98,108,115,116,117,118,119,120,121,122,123,124,125,126,150,156,162,],[87,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,87,-42,87,87,-49,87,-42,87,87,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,87,87,87,]),'RPAREN':([48,49,50,51,52,53,54,55,56,58,59,83,94,96,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,151,152,154,162,],[-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,-64,125,-49,-69,141,-63,-66,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,-67,-68,-65,164,]),'COMMA':([48,49,50,51,52,53,54,55,56,58,59,69,96,97,98,102,103,104,108,111,114,115,116,117,118,119,120,121,122,123,124,125,126,135,138,150,151,152,156,],[-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,105,-49,127,-52,131,-22,-23,-42,-69,142,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,148,149,159,-67,-68,-59,]),'GT':([48,51,52,53,54,55,56,58,59,76,96,108,125,126,],[88,-39,-40,-41,-42,-43,-44,-46,-47,-42,-49,-42,-45,-48,]),'LT':([48,51,52,53,54,55,56,58,59,76,96,108,125,126,],[89,-39,-40,-41,-42,-43,-44,-46,-47,-42,-49,-42,-45,-48,]),'GE':([48,51,52,53,54,55,56,58,59,76,96,108,125,126,],[90,-39,-40,-41,-42,-43,-44,-46,-47,-42,-49,-42,-45,-48,]),'LE':([48,51,52,53,54,55,56,58,59,76,96,108,125,126,],[91,-39,-40,-41,-42,-43,-44,-46,-47,-42,-49,-42,-45,-48,]),'EQ':([48,51,52,53,54,55,56,58,59,76,96,108,125,126,],[92,-39,-40,-41,-42,-43,-44,-46,-47,-42,-49,-42,-45,-48,]),'NE':([48,51,52,53,54,55,56,58,59,76,96,108,125,126,],[93,-39,-40,-41,-42,-43,-44,-46,-47,-42,-49,-42,-45,-48,]),'USING':([73,],[106,]),'AS':([75,],[107,]),'RANGE':([82,],[110,]),}
+_lr_action_items = {'ID':([0,2,4,5,6,7,8,9,10,11,12,13,14,18,25,26,27,28,33,34,35,38,43,47,48,49,50,51,52,53,54,55,56,57,58,59,60,63,64,65,66,67,68,69,70,71,72,74,76,77,78,79,80,81,83,84,85,86,87,88,89,90,91,92,93,96,99,105,106,107,115,116,117,118,119,120,121,122,123,124,125,126,127,130,131,133,134,135,136,137,138,139,142,144,145,147,148,149,153,156,157,158,159,161,163,165,167,],[24,24,-5,-6,24,-9,-26,-27,-28,-29,-30,-31,-32,37,45,46,54,54,-8,66,66,66,76,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,54,-46,-47,54,24,-10,-18,-19,-11,104,-55,-13,-14,-15,-16,-42,-33,-34,-35,108,109,111,54,54,54,54,54,54,54,54,54,54,-49,24,132,136,137,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,54,-12,104,-54,-56,-58,-61,-17,-84,54,111,-71,24,54,132,132,24,-59,-57,-83,54,-72,-62,24,-53,]),'LBRACKET':([0,2,4,5,6,7,8,9,10,11,12,13,14,27,28,33,36,43,44,47,48,49,50,51,52,53,54,55,56,57,58,59,60,63,64,65,66,67,69,70,71,72,74,76,77,78,79,80,84,85,86,87,88,89,90,91,92,93,96,99,115,116,117,118,119,120,121,122,123,124,125,126,127,130,133,134,135,136,137,138,139,144,145,147,153,156,157,158,159,161,163,165,167,],[18,18,-5,-6,18,-9,-26,-27,-28,-29,-30,-31,-32,60,60,-8,68,80,81,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,60,-46,-47,60,18,-10,-18,-19,-11,-55,-13,-14,-15,-16,-42,-33,-34,-35,60,60,60,60,60,60,60,60,60,60,60,-49,18,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,60,-12,-54,-56,-58,-61,-17,-84,60,-71,18,60,18,-59,-57,-83,60,-72,-62,18,-53,]),'FOR':([0,2,4,5,6,7,8,9,10,11,12,13,14,33,47,48,49,50,51,52,53,54,55,56,58,59,63,64,65,66,67,69,70,71,72,74,76,77,78,79,96,99,115,116,117,118,119,120,121,122,123,124,125,126,130,133,134,135,136,137,138,144,145,153,156,157,158,161,163,165,167,],[25,25,-5,-6,25,-9,-26,-27,-28,-29,-30,-31,-32,-8,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,25,-10,-18,-19,-11,-55,-13,-14,-15,-16,-42,-33,-34,-35,-49,25,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,-12,-54,-56,-58,-61,-17,-84,-71,25,25,-59,-57,-83,-72,-62,25,-53,]),'FUNCTION':([0,2,4,5,6,7,8,9,10,11,12,13,14,33,47,48,49,50,51,52,53,54,55,56,58,59,63,64,65,66,67,69,70,71,72,74,76,77,78,79,96,99,115,116,117,118,119,120,121,122,123,124,125,126,130,133,134,135,136,137,138,144,145,153,156,157,158,161,163,165,167,],[26,26,-5,-6,26,-9,-26,-27,-28,-29,-30,-31,-32,-8,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,26,-10,-18,-19,-11,-55,-13,-14,-15,-16,-42,-33,-34,-35,-49,26,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,-12,-54,-56,-58,-61,-17,-84,-71,26,26,-59,-57,-83,-72,-62,26,-53,]),'RETURN':([0,2,4,5,6,7,8,9,10,11,12,13,14,33,47,48,49,50,51,52,53,54,55,56,58,59,63,64,65,66,67,69,70,71,72,74,76,77,78,79,96,99,115,116,117,118,119,120,121,122,123,124,125,126,130,133,134,135,136,137,138,144,145,153,156,157,158,161,163,165,167,],[27,27,-5,-6,27,-9,-26,-27,-28,-29,-30,-31,-32,-8,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,27,-10,-18,-19,-11,-55,-13,-14,-15,-16,-42,-33,-34,-35,-49,27,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,-12,-54,-56,-58,-61,-17,-84,-71,27,27,-59,-57,-83,-72,-62,27,-53,]),'IF':([0,2,4,5,6,7,8,9,10,11,12,13,14,33,47,48,49,50,51,52,53,54,55,56,58,59,63,64,65,66,67,69,70,71,72,74,76,77,78,79,96,99,115,116,117,118,119,120,121,122,123,124,125,126,130,133,134,135,136,137,138,144,145,153,156,157,158,161,163,165,167,],[28,28,-5,-6,28,-9,-26,-27,-28,-29,-30,-31,-32,-8,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,28,-10,-18,-19,-11,-55,-13,-14,-15,-16,-42,-33,-34,-35,-49,28,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,-12,-54,-56,-58,-61,-17,-84,-71,28,28,-59,-57,-83,-72,-62,28,-53,]),'NAME_KEYWORD':([0,7,64,65,66,67,70,71,72,74,130,136,137,],[15,15,-10,-18,-19,-11,-13,-14,-15,-16,-12,-61,-17,]),'DESCRIPTION_KEYWORD':([0,7,64,65,66,67,70,71,72,74,130,136,137,],[16,16,-10,-18,-19,-11,-13,-14,-15,-16,-12,-61,-17,]),'TAGS_KEYWORD':([0,7,64,65,66,67,70,71,72,74,130,136,137,],[17,17,-10,-18,-19,-11,-13,-14,-15,-16,-12,-61,-17,]),'AUTHOR_KEYWORD':([0,7,64,65,66,67,70,71,72,74,130,136,137,],[19,19,-10,-18,-19,-11,-13,-14,-15,-16,-12,-61,-17,]),'DATE_KEYWORD':([0,7,64,65,66,67,70,71,72,74,130,136,137,],[20,20,-10,-18,-19,-11,-13,-14,-15,-16,-12,-61,-17,]),'DATA_KEYWORD':([0,7,64,65,66,67,70,71,72,74,130,136,137,],[21,21,-10,-18,-19,-11,-13,-14,-15,-16,-12,-61,-17,]),'IMPORT_KEYWORD':([0,7,64,65,66,67,70,71,72,74,130,136,137,],[22,22,-10,-18,-19,-11,-13,-14,-15,-16,-12,-61,-17,]),'REMOTE_KEYWORD':([0,7,64,65,66,67,70,71,72,74,130,136,137,],[23,23,-10,-18,-19,-11,-13,-14,-15,-16,-12,-61,-17,]),'$end':([1,3,6,8,9,10,11,12,13,14,29,30,32,47,48,49,50,51,52,53,54,55,56,58,59,62,69,76,77,78,79,96,115,116,117,118,119,120,121,122,123,124,125,126,129,133,134,135,138,144,156,157,158,161,163,167,],[0,-4,-25,-26,-27,-28,-29,-30,-31,-32,-2,-3,-24,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,-1,-55,-42,-33,-34,-35,-49,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,-60,-54,-56,-58,-84,-71,-59,-57,-83,-72,-62,-53,]),'TEARDOWN':([3,6,8,9,10,11,12,13,14,29,32,47,48,49,50,51,52,53,54,55,56,58,59,69,76,77,78,79,96,115,116,117,118,119,120,121,122,123,124,125,126,133,134,135,138,144,156,157,158,161,163,167,],[31,-25,-26,-27,-28,-29,-30,-31,-32,31,-24,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,-55,-42,-33,-34,-35,-49,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,-54,-56,-58,-84,-71,-59,-57,-83,-72,-62,-53,]),'END':([6,8,9,10,11,12,13,14,32,47,48,49,50,51,52,53,54,55,56,58,59,69,76,77,78,79,96,100,115,116,117,118,119,120,121,122,123,124,125,126,128,133,134,135,138,144,155,156,157,158,160,161,163,166,167,],[-25,-26,-27,-28,-29,-30,-31,-32,-24,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,-55,-42,-33,-34,-35,-49,129,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,144,-54,-56,-58,-84,-71,161,-59,-57,-83,163,-72,-62,167,-53,]),'ELSE':([6,8,9,10,11,12,13,14,32,47,48,49,50,51,52,53,54,55,56,58,59,69,76,77,78,79,96,115,116,117,118,119,120,121,122,123,124,125,126,128,133,134,135,138,144,156,157,158,161,163,167,],[-25,-26,-27,-28,-29,-30,-31,-32,-24,-70,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,-55,-42,-33,-34,-35,-49,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,145,-54,-56,-58,-84,-71,-59,-57,-83,-72,-62,-53,]),'COLON':([15,16,17,19,20,21,22,23,132,],[34,35,36,38,39,40,41,42,147,]),'EQUALS':([24,111,],[43,140,]),'PIPE':([24,76,],[44,44,]),'NUMBER':([27,28,43,57,60,80,84,85,86,87,88,89,90,91,92,93,127,139,140,147,159,],[51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,152,51,51,]),'STRING':([27,28,34,35,38,40,41,42,43,57,60,68,80,84,85,86,87,88,89,90,91,92,93,127,131,139,140,147,159,],[52,52,65,65,65,73,74,75,52,52,52,103,52,52,52,52,52,52,52,52,52,52,52,52,103,52,151,52,52,]),'PLACEHOLDER':([27,28,43,57,60,80,84,85,86,87,88,89,90,91,92,93,127,139,147,159,],[53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,53,]),'LPAREN':([27,28,43,46,57,60,80,84,85,86,87,88,89,90,91,92,93,110,127,139,147,159,],[57,57,57,83,57,57,57,57,57,57,57,57,57,57,57,57,57,139,57,57,57,57,]),'TRUE':([27,28,43,57,60,80,84,85,86,87,88,89,90,91,92,93,127,139,147,159,],[58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,]),'FALSE':([27,28,43,57,60,80,84,85,86,87,88,89,90,91,92,93,127,139,147,159,],[59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,]),'DO':([31,48,49,50,51,52,53,54,55,56,58,59,61,96,115,116,117,118,119,120,121,122,123,124,125,126,141,164,],[63,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,99,-49,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,153,165,]),'RBRACKET':([37,48,49,50,51,52,53,54,55,56,58,59,60,80,95,96,97,98,101,102,103,104,108,109,115,116,117,118,119,120,121,122,123,124,125,126,143,146,],[69,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,96,96,126,-49,-50,-52,130,-21,-22,-23,69,138,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,-51,-20,]),'DATE':([39,],[71,]),'IN':([45,],[82,]),'PLUS':([47,48,49,50,51,52,53,54,55,56,58,59,61,76,77,94,96,98,108,115,116,117,118,119,120,121,122,123,124,125,126,150,156,162,],[84,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,84,-42,84,84,-49,84,-42,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,84,84,84,]),'MINUS':([47,48,49,50,51,52,53,54,55,56,58,59,61,76,77,94,96,98,108,115,116,117,118,119,120,121,122,123,124,125,126,150,156,162,],[85,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,85,-42,85,85,-49,85,-42,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,85,85,85,]),'TIMES':([47,48,49,50,51,52,53,54,55,56,58,59,61,76,77,94,96,98,108,115,116,117,118,119,120,121,122,123,124,125,126,150,156,162,],[86,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,86,-42,86,86,-49,86,-42,86,86,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,86,86,86,]),'DIVIDE':([47,48,49,50,51,52,53,54,55,56,58,59,61,76,77,94,96,98,108,115,116,117,118,119,120,121,122,123,124,125,126,150,156,162,],[87,-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,87,-42,87,87,-49,87,-42,87,87,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,87,87,87,]),'RPAREN':([48,49,50,51,52,53,54,55,56,58,59,83,94,96,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,151,152,154,162,],[-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,-64,125,-49,-69,141,-63,-66,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,-67,-68,-65,164,]),'COMMA':([48,49,50,51,52,53,54,55,56,58,59,69,96,97,98,102,103,104,108,111,114,115,116,117,118,119,120,121,122,123,124,125,126,135,138,150,151,152,156,],[-36,-37,-38,-39,-40,-41,-42,-43,-44,-46,-47,105,-49,127,-52,131,-22,-23,-42,-69,142,-79,-80,-81,-82,-73,-74,-75,-76,-77,-78,-45,-48,148,149,159,-67,-68,-59,]),'GT':([48,51,52,53,54,55,56,58,59,76,96,108,125,126,],[88,-39,-40,-41,-42,-43,-44,-46,-47,-42,-49,-42,-45,-48,]),'LT':([48,51,52,53,54,55,56,58,59,76,96,108,125,126,],[89,-39,-40,-41,-42,-43,-44,-46,-47,-42,-49,-42,-45,-48,]),'GE':([48,51,52,53,54,55,56,58,59,76,96,108,125,126,],[90,-39,-40,-41,-42,-43,-44,-46,-47,-42,-49,-42,-45,-48,]),'LE':([48,51,52,53,54,55,56,58,59,76,96,108,125,126,],[91,-39,-40,-41,-42,-43,-44,-46,-47,-42,-49,-42,-45,-48,]),'EQ':([48,51,52,53,54,55,56,58,59,76,96,108,125,126,],[92,-39,-40,-41,-42,-43,-44,-46,-47,-42,-49,-42,-45,-48,]),'NE':([48,51,52,53,54,55,56,58,59,76,96,108,125,126,],[93,-39,-40,-41,-42,-43,-44,-46,-47,-42,-49,-42,-45,-48,]),'USING':([73,],[106,]),'AS':([75,],[107,]),'RANGE':([82,],[110,]),}
 
 _lr_action = {}
 for _k, _v in _lr_action_items.items():
@@ -44,71 +44,71 @@ _lr_productions = [
   ('metadata_item -> DATA_KEYWORD COLON data_source','metadata_item',3,'p_metadata_item','parser.py',70),
   ('metadata_item -> IMPORT_KEYWORD COLON STRING','metadata_item',3,'p_metadata_item','parser.py',71),
   ('metadata_item -> REMOTE_KEYWORD COLON STRING AS ID','metadata_item',5,'p_metadata_item','parser.py',72),
-  ('metadata_value -> STRING','metadata_value',1,'p_metadata_value','parser.py',89),
-  ('metadata_value -> ID','metadata_value',1,'p_metadata_value','parser.py',90),
-  ('tags -> tag COMMA tags','tags',3,'p_tags','parser.py',95),
-  ('tags -> tag','tags',1,'p_tags','parser.py',96),
-  ('tag -> STRING','tag',1,'p_tag','parser.py',104),
-  ('tag -> ID','tag',1,'p_tag','parser.py',105),
-  ('statements -> statement statements','statements',2,'p_statements','parser.py',110),
-  ('statements -> statement','statements',1,'p_statements','parser.py',111),
-  ('statement -> assignment','statement',1,'p_statement','parser.py',119),
-  ('statement -> keyword_call','statement',1,'p_statement','parser.py',120),
-  ('statement -> remote_keyword_call','statement',1,'p_statement','parser.py',121),
-  ('statement -> loop','statement',1,'p_statement','parser.py',122),
-  ('statement -> custom_keyword','statement',1,'p_statement','parser.py',123),
-  ('statement -> return_statement','statement',1,'p_statement','parser.py',124),
-  ('statement -> if_statement','statement',1,'p_statement','parser.py',125),
-  ('assignment -> ID EQUALS expression','assignment',3,'p_assignment','parser.py',130),
-  ('assignment -> ID EQUALS keyword_call','assignment',3,'p_assignment','parser.py',131),
-  ('assignment -> ID EQUALS remote_keyword_call','assignment',3,'p_assignment','parser.py',132),
-  ('expression -> expr_atom','expression',1,'p_expression','parser.py',142),
-  ('expression -> comparison_expr','expression',1,'p_expression','parser.py',143),
-  ('expression -> arithmetic_expr','expression',1,'p_expression','parser.py',144),
-  ('expr_atom -> NUMBER','expr_atom',1,'p_expr_atom','parser.py',153),
-  ('expr_atom -> STRING','expr_atom',1,'p_expr_atom','parser.py',154),
-  ('expr_atom -> PLACEHOLDER','expr_atom',1,'p_expr_atom','parser.py',155),
-  ('expr_atom -> ID','expr_atom',1,'p_expr_atom','parser.py',156),
-  ('expr_atom -> boolean_expr','expr_atom',1,'p_expr_atom','parser.py',157),
-  ('expr_atom -> list_expr','expr_atom',1,'p_expr_atom','parser.py',158),
-  ('expr_atom -> LPAREN expression RPAREN','expr_atom',3,'p_expr_atom','parser.py',159),
-  ('boolean_expr -> TRUE','boolean_expr',1,'p_boolean_expr','parser.py',170),
-  ('boolean_expr -> FALSE','boolean_expr',1,'p_boolean_expr','parser.py',171),
-  ('list_expr -> LBRACKET list_items RBRACKET','list_expr',3,'p_list_expr','parser.py',176),
-  ('list_expr -> LBRACKET RBRACKET','list_expr',2,'p_list_expr','parser.py',177),
-  ('list_items -> list_item','list_items',1,'p_list_items','parser.py',185),
-  ('list_items -> list_item COMMA list_items','list_items',3,'p_list_items','parser.py',186),
-  ('list_item -> expression','list_item',1,'p_list_item','parser.py',194),
-  ('loop -> FOR ID IN RANGE LPAREN expression COMMA expression RPAREN DO statements END','loop',12,'p_loop','parser.py',199),
-  ('keyword_call -> LBRACKET ID RBRACKET COMMA parameter_list','keyword_call',5,'p_keyword_call','parser.py',204),
-  ('keyword_call -> LBRACKET ID RBRACKET','keyword_call',3,'p_keyword_call','parser.py',205),
-  ('parameter_list -> parameter_items','parameter_list',1,'p_parameter_list','parser.py',213),
-  ('parameter_items -> parameter_item COMMA parameter_items','parameter_items',3,'p_parameter_items','parser.py',218),
-  ('parameter_items -> parameter_item','parameter_items',1,'p_parameter_items','parser.py',219),
-  ('parameter_item -> ID COLON expression','parameter_item',3,'p_parameter_item','parser.py',227),
-  ('teardown -> TEARDOWN_KEYWORD DO statements END','teardown',4,'p_teardown','parser.py',232),
-  ('data_source -> STRING USING ID','data_source',3,'p_data_source','parser.py',237),
-  ('custom_keyword -> KEYWORD_KEYWORD ID LPAREN param_definitions RPAREN DO statements END','custom_keyword',8,'p_custom_keyword','parser.py',242),
-  ('param_definitions -> param_def_list','param_definitions',1,'p_param_definitions','parser.py',247),
-  ('param_definitions -> <empty>','param_definitions',0,'p_param_definitions','parser.py',248),
-  ('param_def_list -> param_def COMMA param_def_list','param_def_list',3,'p_param_def_list','parser.py',256),
-  ('param_def_list -> param_def','param_def_list',1,'p_param_def_list','parser.py',257),
-  ('param_def -> ID EQUALS STRING','param_def',3,'p_param_def','parser.py',265),
-  ('param_def -> ID EQUALS NUMBER','param_def',3,'p_param_def','parser.py',266),
-  ('param_def -> ID','param_def',1,'p_param_def','parser.py',267),
-  ('return_statement -> RETURN expression','return_statement',2,'p_return_statement','parser.py',275),
-  ('if_statement -> IF expression DO statements END','if_statement',5,'p_if_statement','parser.py',280),
-  ('if_statement -> IF expression DO statements ELSE statements END','if_statement',7,'p_if_statement','parser.py',281),
-  ('comparison_expr -> expr_atom GT expr_atom','comparison_expr',3,'p_comparison_expr','parser.py',289),
-  ('comparison_expr -> expr_atom LT expr_atom','comparison_expr',3,'p_comparison_expr','parser.py',290),
-  ('comparison_expr -> expr_atom GE expr_atom','comparison_expr',3,'p_comparison_expr','parser.py',291),
-  ('comparison_expr -> expr_atom LE expr_atom','comparison_expr',3,'p_comparison_expr','parser.py',292),
-  ('comparison_expr -> expr_atom EQ expr_atom','comparison_expr',3,'p_comparison_expr','parser.py',293),
-  ('comparison_expr -> expr_atom NE expr_atom','comparison_expr',3,'p_comparison_expr','parser.py',294),
-  ('arithmetic_expr -> expression PLUS expression','arithmetic_expr',3,'p_arithmetic_expr','parser.py',317),
-  ('arithmetic_expr -> expression MINUS expression','arithmetic_expr',3,'p_arithmetic_expr','parser.py',318),
-  ('arithmetic_expr -> expression TIMES expression','arithmetic_expr',3,'p_arithmetic_expr','parser.py',319),
-  ('arithmetic_expr -> expression DIVIDE expression','arithmetic_expr',3,'p_arithmetic_expr','parser.py',320),
-  ('remote_keyword_call -> ID PIPE LBRACKET ID RBRACKET COMMA parameter_list','remote_keyword_call',7,'p_remote_keyword_call','parser.py',351),
-  ('remote_keyword_call -> ID PIPE LBRACKET ID RBRACKET','remote_keyword_call',5,'p_remote_keyword_call','parser.py',352),
+  ('metadata_value -> STRING','metadata_value',1,'p_metadata_value','parser.py',91),
+  ('metadata_value -> ID','metadata_value',1,'p_metadata_value','parser.py',92),
+  ('tags -> tag COMMA tags','tags',3,'p_tags','parser.py',97),
+  ('tags -> tag','tags',1,'p_tags','parser.py',98),
+  ('tag -> STRING','tag',1,'p_tag','parser.py',106),
+  ('tag -> ID','tag',1,'p_tag','parser.py',107),
+  ('statements -> statement statements','statements',2,'p_statements','parser.py',112),
+  ('statements -> statement','statements',1,'p_statements','parser.py',113),
+  ('statement -> assignment','statement',1,'p_statement','parser.py',121),
+  ('statement -> keyword_call','statement',1,'p_statement','parser.py',122),
+  ('statement -> remote_keyword_call','statement',1,'p_statement','parser.py',123),
+  ('statement -> loop','statement',1,'p_statement','parser.py',124),
+  ('statement -> custom_keyword','statement',1,'p_statement','parser.py',125),
+  ('statement -> return_statement','statement',1,'p_statement','parser.py',126),
+  ('statement -> if_statement','statement',1,'p_statement','parser.py',127),
+  ('assignment -> ID EQUALS expression','assignment',3,'p_assignment','parser.py',132),
+  ('assignment -> ID EQUALS keyword_call','assignment',3,'p_assignment','parser.py',133),
+  ('assignment -> ID EQUALS remote_keyword_call','assignment',3,'p_assignment','parser.py',134),
+  ('expression -> expr_atom','expression',1,'p_expression','parser.py',144),
+  ('expression -> comparison_expr','expression',1,'p_expression','parser.py',145),
+  ('expression -> arithmetic_expr','expression',1,'p_expression','parser.py',146),
+  ('expr_atom -> NUMBER','expr_atom',1,'p_expr_atom','parser.py',155),
+  ('expr_atom -> STRING','expr_atom',1,'p_expr_atom','parser.py',156),
+  ('expr_atom -> PLACEHOLDER','expr_atom',1,'p_expr_atom','parser.py',157),
+  ('expr_atom -> ID','expr_atom',1,'p_expr_atom','parser.py',158),
+  ('expr_atom -> boolean_expr','expr_atom',1,'p_expr_atom','parser.py',159),
+  ('expr_atom -> list_expr','expr_atom',1,'p_expr_atom','parser.py',160),
+  ('expr_atom -> LPAREN expression RPAREN','expr_atom',3,'p_expr_atom','parser.py',161),
+  ('boolean_expr -> TRUE','boolean_expr',1,'p_boolean_expr','parser.py',172),
+  ('boolean_expr -> FALSE','boolean_expr',1,'p_boolean_expr','parser.py',173),
+  ('list_expr -> LBRACKET list_items RBRACKET','list_expr',3,'p_list_expr','parser.py',178),
+  ('list_expr -> LBRACKET RBRACKET','list_expr',2,'p_list_expr','parser.py',179),
+  ('list_items -> list_item','list_items',1,'p_list_items','parser.py',187),
+  ('list_items -> list_item COMMA list_items','list_items',3,'p_list_items','parser.py',188),
+  ('list_item -> expression','list_item',1,'p_list_item','parser.py',196),
+  ('loop -> FOR ID IN RANGE LPAREN expression COMMA expression RPAREN DO statements END','loop',12,'p_loop','parser.py',201),
+  ('keyword_call -> LBRACKET ID RBRACKET COMMA parameter_list','keyword_call',5,'p_keyword_call','parser.py',206),
+  ('keyword_call -> LBRACKET ID RBRACKET','keyword_call',3,'p_keyword_call','parser.py',207),
+  ('parameter_list -> parameter_items','parameter_list',1,'p_parameter_list','parser.py',215),
+  ('parameter_items -> parameter_item COMMA parameter_items','parameter_items',3,'p_parameter_items','parser.py',220),
+  ('parameter_items -> parameter_item','parameter_items',1,'p_parameter_items','parser.py',221),
+  ('parameter_item -> ID COLON expression','parameter_item',3,'p_parameter_item','parser.py',229),
+  ('teardown -> TEARDOWN DO statements END','teardown',4,'p_teardown','parser.py',234),
+  ('data_source -> STRING USING ID','data_source',3,'p_data_source','parser.py',239),
+  ('custom_keyword -> FUNCTION ID LPAREN param_definitions RPAREN DO statements END','custom_keyword',8,'p_custom_keyword','parser.py',244),
+  ('param_definitions -> param_def_list','param_definitions',1,'p_param_definitions','parser.py',249),
+  ('param_definitions -> <empty>','param_definitions',0,'p_param_definitions','parser.py',250),
+  ('param_def_list -> param_def COMMA param_def_list','param_def_list',3,'p_param_def_list','parser.py',258),
+  ('param_def_list -> param_def','param_def_list',1,'p_param_def_list','parser.py',259),
+  ('param_def -> ID EQUALS STRING','param_def',3,'p_param_def','parser.py',267),
+  ('param_def -> ID EQUALS NUMBER','param_def',3,'p_param_def','parser.py',268),
+  ('param_def -> ID','param_def',1,'p_param_def','parser.py',269),
+  ('return_statement -> RETURN expression','return_statement',2,'p_return_statement','parser.py',277),
+  ('if_statement -> IF expression DO statements END','if_statement',5,'p_if_statement','parser.py',282),
+  ('if_statement -> IF expression DO statements ELSE statements END','if_statement',7,'p_if_statement','parser.py',283),
+  ('comparison_expr -> expr_atom GT expr_atom','comparison_expr',3,'p_comparison_expr','parser.py',291),
+  ('comparison_expr -> expr_atom LT expr_atom','comparison_expr',3,'p_comparison_expr','parser.py',292),
+  ('comparison_expr -> expr_atom GE expr_atom','comparison_expr',3,'p_comparison_expr','parser.py',293),
+  ('comparison_expr -> expr_atom LE expr_atom','comparison_expr',3,'p_comparison_expr','parser.py',294),
+  ('comparison_expr -> expr_atom EQ expr_atom','comparison_expr',3,'p_comparison_expr','parser.py',295),
+  ('comparison_expr -> expr_atom NE expr_atom','comparison_expr',3,'p_comparison_expr','parser.py',296),
+  ('arithmetic_expr -> expression PLUS expression','arithmetic_expr',3,'p_arithmetic_expr','parser.py',319),
+  ('arithmetic_expr -> expression MINUS expression','arithmetic_expr',3,'p_arithmetic_expr','parser.py',320),
+  ('arithmetic_expr -> expression TIMES expression','arithmetic_expr',3,'p_arithmetic_expr','parser.py',321),
+  ('arithmetic_expr -> expression DIVIDE expression','arithmetic_expr',3,'p_arithmetic_expr','parser.py',322),
+  ('remote_keyword_call -> ID PIPE LBRACKET ID RBRACKET COMMA parameter_list','remote_keyword_call',7,'p_remote_keyword_call','parser.py',353),
+  ('remote_keyword_call -> ID PIPE LBRACKET ID RBRACKET','remote_keyword_call',5,'p_remote_keyword_call','parser.py',354),
 ]

pytest_dsl/core/plugin_discovery.py

@@ -114,15 +114,8 @@ def scan_local_keywords() -> None:
     """
     扫描本地keywords目录中的关键字
     
-    1. 先尝试导入内置的keywords包（向后兼容）
-    2. 再查找并导入用户项目根目录下的keywords目录中的Python模块
+    再查找并导入用户项目根目录下的keywords目录中的Python模块
     """
-    # 1. 尝试导入内置的keywords包
-    try:
-        import keywords
-    except ImportError:
-        print("提示: 未找到内置关键字包")
-    
     # 2. 查找并导入用户项目中的keywords目录
     try:
         # 获取当前工作目录，通常是用户项目的根目录

pytest_dsl/core/yaml_loader.py

@@ -10,7 +10,7 @@ from pytest_dsl.core.yaml_vars import yaml_vars
 
 def add_yaml_options(parser):
     """添加YAML变量相关的命令行参数选项
-    
+
     Args:
         parser: pytest命令行参数解析器
     """
@@ -29,34 +29,111 @@ def add_yaml_options(parser):
     )
 
 
-def load_yaml_variables(config):
-    """加载YAML变量文件
-    
-    从命令行参数指定的文件和目录加载YAML变量。
-    
+def load_yaml_variables_from_args(yaml_files=None, yaml_vars_dir=None, project_root=None):
+    """从参数加载YAML变量文件（通用函数）
+
     Args:
-        config: pytest配置对象
+        yaml_files: YAML文件列表
+        yaml_vars_dir: YAML变量目录路径
+        project_root: 项目根目录（用于默认config目录）
     """
     # 加载单个YAML文件
-    yaml_files = config.getoption('--yaml-vars')
     if yaml_files:
         yaml_vars.load_yaml_files(yaml_files)
         print(f"已加载YAML变量文件: {', '.join(yaml_files)}")
 
     # 加载目录中的YAML文件
-    yaml_vars_dir = config.getoption('--yaml-vars-dir')
-    if yaml_vars_dir is None:
-        # 默认使用使用者项目根目录下的config目录
-        # 通过pytest的rootdir获取使用者的项目根目录
-        project_root = config.rootdir
-        yaml_vars_dir = str(project_root / 'config')
+    if yaml_vars_dir is None and project_root:
+        # 默认使用项目根目录下的config目录
+        yaml_vars_dir = str(Path(project_root) / 'config')
         print(f"使用默认YAML变量目录: {yaml_vars_dir}")
-    
-    if Path(yaml_vars_dir).exists():
+
+    if yaml_vars_dir and Path(yaml_vars_dir).exists():
         yaml_vars.load_from_directory(yaml_vars_dir)
         print(f"已加载YAML变量目录: {yaml_vars_dir}")
         loaded_files = yaml_vars.get_loaded_files()
         if loaded_files:
-            print(f"目录中加载的文件: {', '.join(loaded_files)}")
-    else:
-        print(f"YAML变量目录不存在: {yaml_vars_dir}")
+            # 过滤出当前目录的文件
+            if yaml_vars_dir:
+                dir_files = [f for f in loaded_files if Path(f).parent == Path(yaml_vars_dir)]
+                if dir_files:
+                    print(f"目录中加载的文件: {', '.join(dir_files)}")
+            else:
+                print(f"加载的文件: {', '.join(loaded_files)}")
+    elif yaml_vars_dir:
+        print(f"YAML变量目录不存在: {yaml_vars_dir}")
+
+    # 加载完YAML变量后，自动连接远程服务器
+    load_remote_servers_from_yaml()
+
+
+def load_yaml_variables(config):
+    """加载YAML变量文件（pytest插件接口）
+
+    从pytest配置对象中获取命令行参数并加载YAML变量。
+
+    Args:
+        config: pytest配置对象
+    """
+    # 获取命令行参数
+    yaml_files = config.getoption('--yaml-vars')
+    yaml_vars_dir = config.getoption('--yaml-vars-dir')
+    project_root = config.rootdir
+
+    # 调用通用加载函数
+    load_yaml_variables_from_args(
+        yaml_files=yaml_files,
+        yaml_vars_dir=yaml_vars_dir,
+        project_root=project_root
+    )
+
+
+def load_remote_servers_from_yaml():
+    """从YAML配置中自动加载远程服务器
+
+    检查YAML变量中是否包含remote_servers配置，如果有则自动连接这些服务器。
+    """
+    try:
+        # 获取远程服务器配置
+        remote_servers_config = yaml_vars.get_variable('remote_servers')
+        if not remote_servers_config:
+            
+            return
+
+        print(f"发现 {len(remote_servers_config)} 个远程服务器配置")
+
+        # 导入远程关键字管理器
+        from pytest_dsl.remote.keyword_client import remote_keyword_manager
+
+        # 遍历配置并连接服务器
+        for server_name, server_config in remote_servers_config.items():
+            try:
+                url = server_config.get('url')
+                alias = server_config.get('alias', server_name)
+                api_key = server_config.get('api_key')
+                sync_config = server_config.get('sync_config')
+
+                if not url:
+                    print(f"跳过服务器 {server_name}: 缺少URL配置")
+                    continue
+
+                print(f"正在连接远程服务器: {server_name} ({url}) 别名: {alias}")
+
+                # 注册远程服务器
+                success = remote_keyword_manager.register_remote_server(
+                    url=url,
+                    alias=alias,
+                    api_key=api_key,
+                    sync_config=sync_config
+                )
+
+                if success:
+                    print(f"成功连接到远程服务器: {server_name} ({url})")
+                else:
+                    print(f"连接远程服务器失败: {server_name} ({url})")
+
+            except Exception as e:
+                print(f"连接远程服务器 {server_name} 时发生错误: {str(e)}")
+
+    except Exception as e:
+        print(f"加载远程服务器配置时发生错误: {str(e)}")

pytest_dsl/examples/assert/assertion_example.auto

@@ -39,6 +39,6 @@ username = [JSON提取],JSON数据:${json_data},JSONPath:'$.user.name',变量名
 bool_value = True
 [断言],条件:'${bool_value} == True',消息:'布尔值断言失败'
 
-@teardown do
+teardown do
     [打印],内容:'所有断言测试通过!'
 end 

pytest_dsl/examples/assert/boolean_test.auto

@@ -29,6 +29,6 @@ bool_true = True
 bool_false = False
 [断言],条件:'${bool_true} and not ${bool_false}',消息:'变量布尔值表达式断言失败'
 
-@teardown do
+teardown do
     [打印],内容:'所有布尔值断言测试通过!'
-end 
+end

pytest_dsl/examples/assert/expression_test.auto

@@ -44,6 +44,6 @@ text = "Hello, World!"
 [数据比较],实际值:'10 + 10',预期值:20,消息:'数据比较表达式失败'
 [数据比较],实际值:'len("Hello")',预期值:5,消息:'函数表达式比较失败'
 
-@teardown do
+teardown do
     [打印],内容:'所有表达式断言测试通过!'
 end 

pytest_dsl/examples/custom/test_advanced_keywords.auto

@@ -26,6 +26,6 @@
 # 不进行复杂断言，只确认返回结果不为空
 [断言],条件:'${报告结果} != ""',消息:'报告结果不应为空'
 
-@teardown do
+teardown do
     [打印],内容:'高级自定义关键字测试完成'
-end 
+end

pytest_dsl/examples/custom/test_custom_keywords.auto

@@ -32,6 +32,6 @@
 
 [断言],条件:'${文本长度} == 10',消息:'长度不匹配'
 
-@teardown do
+teardown do
     [打印],内容:'自定义关键字测试完成'
-end 
+end

pytest_dsl/examples/custom/test_default_values.auto

@@ -29,6 +29,6 @@
 报告结果1 = [生成报告消息],标题:"仅标题测试"
 [打印],内容:'使用默认内容的报告:\n${报告结果1}'
 
-@teardown do
+teardown do
     [打印],内容:'默认值测试完成'
-end 
+end

pytest_dsl/examples/http/file_reference_test.auto

@@ -106,6 +106,6 @@ current_date = "2024-04-08T12:00:00Z"
 
 [打印],内容:'请求JSON已合并: ${request_json}'
 
-@teardown do
+teardown do
     [打印],内容:'外部文件引用测试完成!'
 end 

pytest_dsl/examples/http/http_advanced.auto

@@ -86,6 +86,6 @@
 
 [打印],内容:'段落文本: ${p_text}'
 
-@teardown do
+teardown do
     [打印],内容:'HTTP高级测试完成!'
 end 

pytest_dsl/examples/http/http_example.auto

@@ -142,6 +142,6 @@
 [打印],内容:'获取的随机数: ${random_number}'
 [打印],内容:'断言重试测试完成!'
 
-@teardown do
+teardown do
     [打印],内容:'HTTP请求测试完成!'
 end 

pytest_dsl/examples/http/http_length_test.auto

@@ -50,6 +50,6 @@
 [打印],内容:'正文: ${body}'
 [打印],内容:'正文长度: ${body_length}'
 
-@teardown do
+teardown do
     [打印],内容:'HTTP请求长度捕获测试完成!'
 end 

pytest_dsl/examples/http/http_retry_assertions.auto

@@ -86,6 +86,6 @@
             all: true  # 重试所有断言
     ''',步骤名称:"全局断言重试示例"
 
-@teardown do
+teardown do
     [打印],内容:'断言重试测试完成!'
 end 

pytest_dsl/examples/http/http_retry_assertions_enhanced.auto

@@ -89,6 +89,6 @@
             all: true
     ''',步骤名称:"纯配置式重试示例"
 
-@teardown do
+teardown do
     [打印],内容:'增强断言重试测试完成!'
-end 
+end

pytest_dsl/examples/http/http_with_yaml.auto

@@ -53,6 +53,6 @@
 
 [打印],内容:'请求参数: ${args}'
 
-@teardown do
+teardown do
     [打印],内容:'YAML变量和模板测试完成!'
 end 

pytest_dsl/examples/quickstart/api_basics.auto

@@ -50,6 +50,6 @@
         - ["jsonpath", "$.title", "eq", "测试标题"]
 ''',步骤名称:'创建新文章'
 
-@teardown do
+teardown do
     [打印],内容:'API测试完成!'
 end 

pytest_dsl/examples/quickstart/assertions.auto

@@ -26,6 +26,6 @@ result = 53
 [打印],内容:'结果: ${result}'
 [断言],条件:'${result} == 53',消息:'结果不正确'
 
-@teardown do
+teardown do
     [打印],内容:'断言测试完成!'
 end

pytest_dsl/examples/quickstart/loops.auto

@@ -19,6 +19,6 @@ end
 
 [打印],内容:'循环结束'
 
-@teardown do
+teardown do
     [打印],内容:'变量和循环测试完成!'
-end 
+end