From 78716f4c46761d7863e316fd6c8d62f9c8383e83 Mon Sep 17 00:00:00 2001 From: Xavier Mitault Date: Mon, 31 Oct 2022 11:08:13 +0100 Subject: [PATCH] Change imports --- norma2/regexs/r_comment.py | 3 ++- norma2/regexs/r_declaration.py | 3 ++- norma2/regexs/r_empty.py | 3 ++- norma2/regexs/r_for.py | 3 ++- norma2/regexs/r_function.py | 3 ++- norma2/regexs/r_if.py | 3 ++- norma2/regexs/r_imperativ.py | 3 ++- norma2/regexs/r_macro.py | 3 ++- norma2/regexs/r_prototype.py | 3 ++- norma2/regexs/r_struct.py | 3 ++- norma2/regexs/r_text.py | 3 ++- norma2/regexs/r_union.py | 3 ++- norma2/regexs/r_while.py | 3 ++- 13 files changed, 26 insertions(+), 13 deletions(-) diff --git a/norma2/regexs/r_comment.py b/norma2/regexs/r_comment.py index e63b8cd..d10e5c1 100644 --- a/norma2/regexs/r_comment.py +++ b/norma2/regexs/r_comment.py @@ -2,7 +2,8 @@ from typing import Optional import regex -from regexs import regexs_class + +from norma2.regexs import regexs_class # https://regex101.com/r/I6fr0x/1 re = r"^( ){0,}\/{0,1}\/\*" diff --git a/norma2/regexs/r_declaration.py b/norma2/regexs/r_declaration.py index 0cb53ee..d668aa5 100644 --- a/norma2/regexs/r_declaration.py +++ b/norma2/regexs/r_declaration.py @@ -2,7 +2,8 @@ from typing import Optional import regex -from regexs import regexs_class + +from norma2.regexs import regexs_class # https://regex101.com/r/fBLUOp/2 (old) # re = r"\w{1,}( \*{0,} {0,}\w{1,}(\[[0-9]{0,}\]){0,}){1,} {0,}= {0,}(([0-9]{1,})|(\".*\")|(\{.*\})|([&*]{1,}\w{1,})|(NULL)) {0,};{1}" # noqa: E501 diff --git a/norma2/regexs/r_empty.py b/norma2/regexs/r_empty.py index 273785e..451878e 100644 --- a/norma2/regexs/r_empty.py +++ b/norma2/regexs/r_empty.py @@ -2,7 +2,8 @@ from typing import Optional import regex -from regexs import regexs_class + +from norma2.regexs import regexs_class # https://regex101.com/r/M7NU4a/1 re_end = r"\n[ \t\f]{0,}$" diff --git a/norma2/regexs/r_for.py b/norma2/regexs/r_for.py index 0104e9e..de3cac9 100644 --- a/norma2/regexs/r_for.py +++ b/norma2/regexs/r_for.py @@ -2,7 +2,8 @@ from typing import Optional import regex -from regexs import regexs_class + +from norma2.regexs import regexs_class # https://regex101.com/r/q4jpdl/1 re = r"for(\s)?\(([\w\W\s]*?;){2}([\w\W\s]*?)\)\s{0,}(\{|;)" diff --git a/norma2/regexs/r_function.py b/norma2/regexs/r_function.py index faf6066..19a9174 100644 --- a/norma2/regexs/r_function.py +++ b/norma2/regexs/r_function.py @@ -2,7 +2,8 @@ from typing import Optional import regex -from regexs import regexs_class + +from norma2.regexs import regexs_class # https://regex101.com/r/kBFq4T/5 re = r"\w{1,}(\*{0,} \*{0,} {0,}\w{1,}(\[[0-9]{0,}\]){0,}){1,} {0,}\((((\w{1,} {0,}\n{0,}(\*{0,} \*{0,} {0,}\n{0,} {0,}\w{1,}(\[[0-9]{0,}\]){0,}){1,} {0,}\n{0,} {0,},{0,1} {0,}\n{0,} {0,}){0,})|( {0,}\n{0,} {0,}void {0,}\n{0,} {0,}))\) {0,}\n{0,}\{" # noqa: E501 diff --git a/norma2/regexs/r_if.py b/norma2/regexs/r_if.py index b11ebd0..d6ea40d 100644 --- a/norma2/regexs/r_if.py +++ b/norma2/regexs/r_if.py @@ -2,7 +2,8 @@ from typing import Optional import regex -from regexs import regexs_class + +from norma2.regexs import regexs_class # https://regex101.com/r/ac4QIM/1 re = r"if {0,}\(([\s\S]*?\)) {0,}\{" diff --git a/norma2/regexs/r_imperativ.py b/norma2/regexs/r_imperativ.py index c005008..4a32480 100644 --- a/norma2/regexs/r_imperativ.py +++ b/norma2/regexs/r_imperativ.py @@ -2,7 +2,8 @@ from typing import Optional import regex -from regexs import regexs_class + +from norma2.regexs import regexs_class # https://regex101.com/r/Kybx1Z/1 re = r"^(.*?\\\n){0,}(.*);" diff --git a/norma2/regexs/r_macro.py b/norma2/regexs/r_macro.py index 891524d..2aff04a 100644 --- a/norma2/regexs/r_macro.py +++ b/norma2/regexs/r_macro.py @@ -2,7 +2,8 @@ from typing import Optional import regex -from regexs import regexs_class + +from norma2.regexs import regexs_class # https://regex101.com/r/tp3bAf/1 re = r"#define \w{1,}(\((\w,{0,} {0,}){0,}\)){0,1} {0,}(.*\\\n){0,}(.*){1}" diff --git a/norma2/regexs/r_prototype.py b/norma2/regexs/r_prototype.py index 857459b..888351f 100644 --- a/norma2/regexs/r_prototype.py +++ b/norma2/regexs/r_prototype.py @@ -2,7 +2,8 @@ from typing import Optional import regex -from regexs import regexs_class + +from norma2.regexs import regexs_class # https://regex101.com/r/DJ3cg4/1 re = r"\w{1,}( \*{0,} {0,}\w{1,}(\[[0-9]{0,}\]){0,}){1,} {0,}\((\w{1,} {0,}\n{0,}( \*{0,} {0,}\n{0,} {0,}\w{1,}(\[[0-9]{0,}\]){0,}){1,} {0,}\n{0,} {0,},{0,1} {0,}\n{0,} {0,}){0,}\) {0,}\n{0,};{1}" # noqa: E501 diff --git a/norma2/regexs/r_struct.py b/norma2/regexs/r_struct.py index 3807dc0..57fcca4 100644 --- a/norma2/regexs/r_struct.py +++ b/norma2/regexs/r_struct.py @@ -2,7 +2,8 @@ from typing import Optional import regex -from regexs import regexs_class + +from norma2.regexs import regexs_class # https://regex101.com/r/AUdkaY/1 re = r"(typedef \n{0,}){0,1} {0,}struct {0,}\n{0,} {1,}\w{1,} {0,}\n{0,} {0,}\{" # noqa: E501 diff --git a/norma2/regexs/r_text.py b/norma2/regexs/r_text.py index cce6d50..05a10c6 100644 --- a/norma2/regexs/r_text.py +++ b/norma2/regexs/r_text.py @@ -2,7 +2,8 @@ from typing import Optional import regex -from regexs import regexs_class + +from norma2.regexs import regexs_class # https://regex101.com/r/O7MI5W/1 re = r"\"(.|\n)*?(?