pytest-dsl 0.13.0__py3-none-any.whl → 0.15.0__py3-none-any.whl

pytest_dsl/core/keyword_manager.py

@@ -18,7 +18,7 @@ class KeywordManager:
 
     def register(self, name: str, parameters: List[Dict], source_info: Optional[Dict] = None):
         """关键字注册装饰器
-        
+
         Args:
             name: 关键字名称
             parameters: 参数列表
@@ -29,23 +29,29 @@ class KeywordManager:
             def wrapper(**kwargs):
                 # 获取自定义步骤名称，如果未指定则使用关键字名称
                 step_name = kwargs.pop('step_name', name)
-                
+
+                # 检查是否已经在DSL执行器的步骤中，避免重复记录
+                skip_logging = kwargs.pop('skip_logging', False)
+
                 with allure.step(f"{step_name}"):
                     try:
                         result = func(**kwargs)
-                        self._log_execution(step_name, kwargs, result)
+                        if not skip_logging:
+                            self._log_execution(step_name, kwargs, result)
                         return result
                     except Exception as e:
-                        self._log_failure(step_name, kwargs, e)
+                        if not skip_logging:
+                            self._log_failure(step_name, kwargs, e)
                         raise
 
             param_list = [Parameter(**p) for p in parameters]
             mapping = {p.name: p.mapping for p in param_list}
-            defaults = {p.mapping: p.default for p in param_list if p.default is not None}
-            
+            defaults = {
+                p.mapping: p.default for p in param_list if p.default is not None}
+
             # 自动添加 step_name 到 mapping 中
             mapping["步骤名称"] = "step_name"
-            
+
             # 构建关键字信息，包含来源信息
             keyword_info = {
                 'func': wrapper,
@@ -53,14 +59,14 @@ class KeywordManager:
                 'parameters': param_list,
                 'defaults': defaults  # 存储默认值
             }
-            
+
             # 添加来源信息
             if source_info:
                 keyword_info.update(source_info)
             else:
                 # 尝试从函数模块推断来源信息
                 keyword_info.update(self._infer_source_info(func))
-            
+
             self._keywords[name] = keyword_info
             return wrapper
         return decorator
@@ -68,11 +74,11 @@ class KeywordManager:
     def _infer_source_info(self, func: Callable) -> Dict:
         """从函数推断来源信息"""
         source_info = {}
-        
+
         if hasattr(func, '__module__'):
             module_name = func.__module__
             source_info['module_name'] = module_name
-            
+
             if module_name.startswith('pytest_dsl.keywords'):
                 # 内置关键字
                 source_info['source_type'] = 'builtin'
@@ -90,13 +96,13 @@ class KeywordManager:
                     source_info['source_name'] = parts[0]
                 else:
                     source_info['source_name'] = module_name
-        
+
         return source_info
 
-    def register_with_source(self, name: str, parameters: List[Dict], 
-                           source_type: str, source_name: str, **kwargs):
+    def register_with_source(self, name: str, parameters: List[Dict],
+                             source_type: str, source_name: str, **kwargs):
         """带来源信息的关键字注册装饰器
-        
+
         Args:
             name: 关键字名称
             parameters: 参数列表
@@ -116,18 +122,18 @@ class KeywordManager:
         keyword_info = self._keywords.get(keyword_name)
         if not keyword_info:
             raise KeyError(f"未注册的关键字: {keyword_name}")
-        
+
         # 应用默认值
         final_params = {}
         defaults = keyword_info.get('defaults', {})
-        
+
         # 首先设置所有默认值
         for param_key, default_value in defaults.items():
             final_params[param_key] = default_value
-        
+
         # 然后用传入的参数覆盖默认值
         final_params.update(params)
-        
+
         return keyword_info['func'](**final_params)
 
     def get_keyword_info(self, keyword_name: str) -> Dict:
@@ -135,7 +141,7 @@ class KeywordManager:
         keyword_info = self._keywords.get(keyword_name)
         if not keyword_info:
             return None
-            
+
         # 动态添加step_name参数到参数列表中
         if not any(p.name == "步骤名称" for p in keyword_info['parameters']):
             keyword_info['parameters'].append(Parameter(
@@ -143,19 +149,19 @@ class KeywordManager:
                 mapping="step_name",
                 description="自定义的步骤名称，用于在报告中显示"
             ))
-            
+
         return keyword_info
 
     def get_keywords_by_source(self) -> Dict[str, List[str]]:
         """按来源分组获取关键字"""
         by_source = {}
-        
+
         for name, info in self._keywords.items():
             source_name = info.get('source_name', '未知来源')
             if source_name not in by_source:
                 by_source[source_name] = []
             by_source[source_name].append(name)
-        
+
         return by_source
 
     def _log_execution(self, keyword_name: str, params: Dict, result: Any) -> None:

pytest_dsl/core/parser.py

@@ -1,12 +1,30 @@
 import ply.yacc as yacc
-from pytest_dsl.core.lexer import tokens, get_lexer
+from pytest_dsl.core.lexer import tokens
 
 
 class Node:
-    def __init__(self, type, children=None, value=None):
+    def __init__(self, type, children=None, value=None, line_number=None,
+                 column=None):
         self.type = type
         self.children = children if children else []
         self.value = value
+        self.line_number = line_number  # 添加行号信息
+        self.column = column  # 添加列号信息
+
+    def set_position(self, line_number, column=None):
+        """设置节点位置信息"""
+        self.line_number = line_number
+        self.column = column
+        return self
+
+    def get_position_info(self):
+        """获取位置信息的字符串表示"""
+        if self.line_number is not None:
+            if self.column is not None:
+                return f"行{self.line_number}:列{self.column}"
+            else:
+                return f"行{self.line_number}"
+        return "位置未知"
 
 
 # 定义优先级和结合性
@@ -25,17 +43,23 @@ def p_start(p):
              | statements teardown
              | statements'''
 
+    # 获取起始行号
+    line_number = getattr(p.slice[1], 'lineno', 1) if len(p) > 1 else 1
+
     if len(p) == 4:
-        p[0] = Node('Start', [p[1], p[2], p[3]])
+        p[0] = Node('Start', [p[1], p[2], p[3]], line_number=line_number)
     elif len(p) == 3:
         # 判断第二个元素是teardown还是statements
         if p[2].type == 'Teardown':
-            p[0] = Node('Start', [Node('Metadata', []), p[1], p[2]])
+            p[0] = Node('Start', [Node('Metadata', [],
+                                       line_number=line_number), p[1], p[2]],
+                        line_number=line_number)
         else:
-            p[0] = Node('Start', [p[1], p[2]])
+            p[0] = Node('Start', [p[1], p[2]], line_number=line_number)
     else:
         # 没有metadata和teardown
-        p[0] = Node('Start', [Node('Metadata', []), p[1]])
+        p[0] = Node('Start', [Node('Metadata', [],
+                    line_number=line_number), p[1]], line_number=line_number)
 
 
 def p_metadata(p):
@@ -135,12 +159,17 @@ def p_assignment(p):
     '''assignment : ID EQUALS expression
                  | ID EQUALS keyword_call
                  | ID EQUALS remote_keyword_call'''
+    line_number = getattr(p.slice[1], 'lineno', None)
+
     if isinstance(p[3], Node) and p[3].type == 'KeywordCall':
-        p[0] = Node('AssignmentKeywordCall', [p[3]], p[1])
+        p[0] = Node('AssignmentKeywordCall', [p[3]],
+                    p[1], line_number=line_number)
     elif isinstance(p[3], Node) and p[3].type == 'RemoteKeywordCall':
-        p[0] = Node('AssignmentRemoteKeywordCall', [p[3]], p[1])
+        p[0] = Node('AssignmentRemoteKeywordCall', [
+                    p[3]], p[1], line_number=line_number)
     else:
-        p[0] = Node('Assignment', value=p[1], children=[p[3]])
+        p[0] = Node('Assignment', value=p[1], children=[
+                    p[3]], line_number=line_number)
 
 
 def p_expression(p):
@@ -225,17 +254,20 @@ def p_dict_item(p):
 
 
 def p_loop(p):
-    '''loop : FOR ID IN RANGE LPAREN expression COMMA expression RPAREN DO statements END'''
-    p[0] = Node('ForLoop', [p[6], p[8], p[11]], p[2])
+    '''loop : FOR ID IN RANGE LPAREN expression COMMA expression RPAREN DO statements END'''  # noqa: E501
+    line_number = getattr(p.slice[1], 'lineno', None)
+    p[0] = Node('ForLoop', [p[6], p[8], p[11]], p[2], line_number=line_number)
 
 
 def p_keyword_call(p):
     '''keyword_call : LBRACKET ID RBRACKET COMMA parameter_list
                    | LBRACKET ID RBRACKET'''
+    line_number = getattr(p.slice[1], 'lineno', None)
+
     if len(p) == 6:
-        p[0] = Node('KeywordCall', [p[5]], p[2])
+        p[0] = Node('KeywordCall', [p[5]], p[2], line_number=line_number)
     else:
-        p[0] = Node('KeywordCall', [[]], p[2])
+        p[0] = Node('KeywordCall', [[]], p[2], line_number=line_number)
 
 
 def p_parameter_list(p):
@@ -268,7 +300,7 @@ def p_data_source(p):
 
 
 def p_custom_keyword(p):
-    '''custom_keyword : FUNCTION ID LPAREN param_definitions RPAREN DO statements END'''
+    '''custom_keyword : FUNCTION ID LPAREN param_definitions RPAREN DO statements END'''  # noqa: E501
     p[0] = Node('CustomKeyword', [p[4], p[7]], p[2])
 
 
@@ -319,7 +351,7 @@ def p_if_statement(p):
     '''if_statement : IF expression DO statements END
                    | IF expression DO statements elif_clauses END
                    | IF expression DO statements ELSE statements END
-                   | IF expression DO statements elif_clauses ELSE statements END'''
+                   | IF expression DO statements elif_clauses ELSE statements END'''  # noqa: E501
     if len(p) == 6:
         # if condition do statements end
         p[0] = Node('IfStatement', [p[2], p[4]], None)
@@ -401,17 +433,61 @@ def p_arithmetic_expr(p):
     p[0] = Node('ArithmeticExpr', [p[1], p[3]], operator)
 
 
+# 全局变量用于存储解析错误
+_parse_errors = []
+
+
 def p_error(p):
+    global _parse_errors
     if p:
-        print(
-            f"语法错误: 在第 {p.lineno} 行, 位置 {p.lexpos}, Token {p.type}, 值: {p.value}")
+        error_msg = (f"语法错误: 在第 {p.lineno} 行, 位置 {p.lexpos}, "
+                     f"Token {p.type}, 值: {p.value}")
+        _parse_errors.append({
+            'message': error_msg,
+            'line': p.lineno,
+            'position': p.lexpos,
+            'token_type': p.type,
+            'token_value': p.value
+        })
+        # 不再直接打印，而是存储错误信息
     else:
-        print("语法错误: 在文件末尾")
+        error_msg = "语法错误: 在文件末尾"
+        _parse_errors.append({
+            'message': error_msg,
+            'line': None,
+            'position': None,
+            'token_type': None,
+            'token_value': None
+        })
 
 
 def get_parser(debug=False):
     return yacc.yacc(debug=debug)
 
+
+def parse_with_error_handling(content, lexer=None):
+    """带错误处理的解析函数
+
+    Args:
+        content: DSL内容
+        lexer: 词法分析器实例
+
+    Returns:
+        tuple: (AST节点, 错误列表)
+    """
+    global _parse_errors
+    _parse_errors = []  # 清空之前的错误
+
+    if lexer is None:
+        from pytest_dsl.core.lexer import get_lexer
+        lexer = get_lexer()
+
+    parser = get_parser()
+    ast = parser.parse(content, lexer=lexer)
+
+    # 返回AST和错误列表
+    return ast, _parse_errors.copy()
+
 # 定义远程关键字调用的语法规则