pyscreeps-arena 0.5.9b3__tar.gz → 0.5.9b5__tar.gz

{pyscreeps_arena-0.5.9b3 → pyscreeps_arena-0.5.9b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyscreeps-arena
-Version: 0.5.9b3
+Version: 0.5.9b5
 Summary: Python api|interface to play game: Screeps: Arena.
 Author-email: 2229066748@qq.com
 Maintainer: Eagle'sBaby

{pyscreeps_arena-0.5.9b3 → pyscreeps_arena-0.5.9b5}/pyscreeps_arena/compiler.py

@@ -53,6 +53,7 @@ def replace_src_prefix(file_list):
 #     """
 #     return PYFILE_PRAGMA_INSERTS + "\n" + content
 class Compiler_Const:
+    CALLED_FUNCTIONS = ['behavior', 'sequence', 'selector', 'parallel', 'listen']
     PROTO_DEFINES_DIRS = ["builtin", "library"]
     FILE_STRONG_REPLACE = {
         "std": {
@@ -109,7 +110,7 @@ export var loop = function () {
     if (know.now === 1) {
 	    std.show_welcome();
 		init (know);
-		
+
 	}
 	step (know);
     timeLine = get.cpu_us();
@@ -667,7 +668,7 @@ class Compiler_Utils(Compiler_Const):
 
         # 2. 查找所有 @<caller_name>(...) 装饰器（支持多行参数）
         decorator_pattern = re.compile(
-            r'^\s*@\s*' + re.escape(caller_name) + r'\s*\((.*?)\)\s*$\n?', 
+            r'^\s*@\s*' + re.escape(caller_name) + r'\s*\((.*?)\)\s*$\n?',
             re.MULTILINE | re.DOTALL
         )
 
@@ -998,6 +999,8 @@ class Compiler(CompilerBase):
 
                     # 将PYFILE_PRAGMA_INSERTS.replace("\t", "").replace("    ", "")插入到文件开头
                     content = self.auto_read(fpath)
+                    # 移除"""$..."""代码块
+                    content = re.sub(r'"""\$[\s\S]*?"""', '', content)
                     content = self.PYFILE_PRAGMA_INSERTS.replace("\t", "").replace("    ", "") + content
                     # content = self.remove_long_docstring(content)  # 移除长注释 | remove long docstring
 
@@ -1159,7 +1162,7 @@ class Compiler(CompilerBase):
             content = self.auto_read(fpath)
             content = self.stage_recursive_replace(content)  # 调用stage_recursive_replace
             # 调用stage_called_replace处理四个装饰器
-            for caller in ['behavior', 'sequence', 'selector', 'parallel']:
+            for caller in self.CALLED_FUNCTIONS:
                 content = self.stage_called_replace(caller, content)
             with open(fpath, 'w', encoding='utf-8') as f:
                 f.write(content)
@@ -1512,7 +1515,7 @@ if __name__ == '__main__':
     # compiler.compile()
     # compiler.clean()
     test = """
-    
+
 def patrolling(self, c: Creep):
     e = self.center.nearest(k.civilian.enemies, 5)
     if e:
@@ -1522,6 +1525,6 @@ def patrolling(self, c: Creep):
         ):
             case True: c.move(e, SWAMP_MOTION)
             case False: c.move(self.bpos, SWAMP_MOTION)
-    
+
     """
     print(f"res=\n{Compiler.convert_match_to_if(test)}")

{pyscreeps_arena-0.5.9b3 → pyscreeps_arena-0.5.9b5}/pyscreeps_arena.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyscreeps-arena
-Version: 0.5.9b3
+Version: 0.5.9b5
 Summary: Python api|interface to play game: Screeps: Arena.
 Author-email: 2229066748@qq.com
 Maintainer: Eagle'sBaby

{pyscreeps_arena-0.5.9b3 → pyscreeps_arena-0.5.9b5}/setup.py

@@ -7,7 +7,7 @@ with open(r"T:\New_PC\Import_Project\uploads\pyscreeps-arena_upload\pyscreeps-ar
     long_description = f.read()
 setup(
     name='pyscreeps-arena',
-    version='0.5.9b3',
+    version='0.5.9b5',
     description='Python api|interface to play game: Screeps: Arena.',
     long_description=long_description,
     long_description_content_type='text/markdown',