rpc-language 2.5__tar.gz → 3.0__tar.gz

{rpc_language-2.5 → rpc_language-3.0}/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.4
 Name: rpc-language
-Version: 2.5
+Version: 3.0
 Requires-Dist: pyinstaller
 Dynamic: requires-dist

{rpc_language-2.5 → rpc_language-3.0}/rpc.py

@@ -3,26 +3,60 @@ import shutil
 import time
 import sys
 import os
+import re
 
 class RPC:
     class NeedSemicolon(Exception):
         def __init__(self, message):
             super().__init__(message)
+    class MismatchedQuotationMarks(Exception):
+        def __init__(self, message):
+            super().__init__(message)
 
 def parse(line):
     indent   = len(line) - len(line.lstrip())
     line     = line.lstrip()
     add      = False
 
-    if line.endswith(";"):     line = line[:-1]
-    elif line == "":           pass
-    elif line.endswith("{"):   pass
-    elif line.endswith("}"):   pass
-    elif line.endswith(">"):   pass
-    elif line.endswith("++"):  pass
-    elif line.endswith("--"):  pass
-    elif line.endswith("?"):   pass
-    else:                      raise RPC.NeedSemicolon("缺少分号")
+    mark1a = 0
+    mark1b = 0
+    text = line.split("//")[0]
+    for i in line:
+        if i == "'":
+            mark1a += 1
+        if i == '"':
+            mark1b += 1
+
+    mark2a = 0
+    mark2b = 0
+    for i in text:
+        if i == "'":
+            mark2a += 1
+        if i == '"':
+            mark2b += 1
+
+    if mark1a % 2 == 0:
+        if mark1b % 2 == 0:
+            pass
+        else:
+            raise RPC.MismatchedQuotationMarks("不匹配的引号")
+    else:
+        raise RPC.MismatchedQuotationMarks("不匹配的引号")
+
+    if "//" in line:
+        if mark2a % 2 == 0 or mark2a == 0:
+            if mark2b % 2 == 0 or mark2b == 0:
+                line = line.split("//")[0].rstrip()
+
+    if line.endswith(";"):    line = line[:-1]
+    elif line == "":          pass
+    elif line.endswith("{"):  pass
+    elif line.endswith("}"):  pass
+    elif line.endswith(">"):  pass
+    elif line.endswith("++"): pass
+    elif line.endswith("--"): pass
+    elif line.endswith("?"):  pass
+    else:                     raise RPC.NeedSemicolon("缺少分号")
 
     if line.startswith("loop"):
         if line.endswith("loop"):
@@ -36,15 +70,12 @@ def parse(line):
                 ok = False
 
             if ok is True:
-                if line.endswith("{"):
-                    line = f"for _ in range({line[5:-1].rstrip()})" + line[-1]
-                else:
-                    line = f"for _ in range({line[5:-1].rstrip()}):" + line[-1]
+                line = f"for _ in range({line[5:-1].rstrip()}):"
             else:
                 if line.endswith("{"):
-                    line = "while True" + line[4:]
+                    line = "while True:" + line[4:-1].rstrip()
                 else:
-                    line = "while True:" + line[4:]
+                    line = "while True:" + line[4:].rstrip()
 
     if line.startswith("fn "):
         line = 'def ' + line[3:]

{rpc_language-2.5 → rpc_language-3.0}/rpc_language.egg-info/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.4
 Name: rpc-language
-Version: 2.5
+Version: 3.0
 Requires-Dist: pyinstaller
 Dynamic: requires-dist

{rpc_language-2.5 → rpc_language-3.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="rpc-language",
-    version="2.5",
+    version="3.0",
     py_modules=["rpc"],
     install_requires=["pyinstaller"],
     entry_points={