jaclang 0.7.21__py3-none-any.whl → 0.7.22__py3-none-any.whl

jaclang/compiler/absyntree.py

@@ -2873,13 +2873,24 @@ class FString(AtomExpr):
         if deep:
             res = self.parts.normalize(deep) if self.parts else res
         new_kid: list[AstNode] = []
+        is_single_quote = (
+            isinstance(self.kid[0], Token) and self.kid[0].name == Tok.FSTR_SQ_START
+        )
         if self.parts:
+            if is_single_quote:
+                new_kid.append(self.gen_token(Tok.FSTR_SQ_START))
+            else:
+                new_kid.append(self.gen_token(Tok.FSTR_START))
             for i in self.parts.items:
                 if isinstance(i, String):
                     i.value = (
                         "{{" if i.value == "{" else "}}" if i.value == "}" else i.value
                     )
             new_kid.append(self.parts)
+            if is_single_quote:
+                new_kid.append(self.gen_token(Tok.FSTR_SQ_END))
+            else:
+                new_kid.append(self.gen_token(Tok.FSTR_END))
         self.set_kids(nodes=new_kid)
         return res
 
@@ -4257,7 +4268,6 @@ class String(Literal):
         """Return literal value in its python type."""
         if isinstance(self.value, bytes):
             return self.value
-        prefix_len = 3 if self.value.startswith(("'''", '"""')) else 1
         if any(
             self.value.startswith(prefix)
             and self.value[len(prefix) :].startswith(("'", '"'))
@@ -4266,8 +4276,23 @@ class String(Literal):
             return eval(self.value)
 
         elif self.value.startswith(("'", '"')):
-            ret_str = self.value[prefix_len:-prefix_len]
-            return ret_str.encode().decode("unicode_escape", errors="backslashreplace")
+            repr_str = self.value.encode().decode("unicode_escape")
+            if (
+                self.value.startswith('"""')
+                and self.value.endswith('"""')
+                and not self.find_parent_of_type(FString)
+            ):
+                return repr_str[3:-3]
+            if (not self.find_parent_of_type(FString)) or (
+                not (
+                    self.parent
+                    and isinstance(self.parent, SubNodeList)
+                    and self.parent.parent
+                    and isinstance(self.parent.parent, FString)
+                )
+            ):
+                return repr_str[1:-1]
+            return repr_str
         else:
             return self.value
 

jaclang/compiler/passes/main/pyast_load_pass.py

@@ -1148,14 +1148,16 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             else:
                 token_type = f"{value_type.__name__.upper()}"
 
+            if value_type == str:
+                raw_repr = repr(node.value)
+                quote = "'" if raw_repr.startswith("'") else '"'
+                value = f"{quote}{raw_repr[1:-1]}{quote}"
+            else:
+                value = str(node.value)
             return type_mapping[value_type](
                 file_path=self.mod_path,
                 name=token_type,
-                value=(
-                    f'"{repr(node.value)[1:-1]}"'
-                    if value_type == str
-                    else str(node.value)
-                ),
+                value=value,
                 line=node.lineno,
                 end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
@@ -2625,7 +2627,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
 
     def convert_to_doc(self, string: ast.String) -> None:
         """Convert a string to a docstring."""
-        string.value = f'""{string.value}""'
+        string.value = f'"""{string.value[1:-1]}"""'
 
     def aug_op_map(self, tok_dict: dict, op: ast.Token) -> str:
         """aug_mapper."""

jaclang/compiler/passes/main/tests/fixtures/fstrings.jac

@@ -1,4 +1,47 @@
 """Small test for fstrings."""
 
+glob apple = 2;
+glob a=f"hello {40 + 2}   wor{apple}ld  ";
 
-glob a=f"hello {40 + 2}   wor{apple}ld  ";
+with entry {
+    a = 9;
+    s_2 = "'''hello'''";
+    s_3 = "'''hello  '''";
+    s_4 = "''' hello'''";
+    s_5 = '""" hello"""';
+    s_6 = '"""hello"""';
+    s_7 = '"""hello"" "';
+    s_8 = '"""hello""" ';
+    print(
+        len(s_2),
+        len(s_3),
+        len(s_4),
+        len(s_5),
+        len(s_6),
+        len(s_7),
+        len(s_8)
+    ) ;
+    b1 = f"{"'''hello''' "}";
+    b_2 = f"{'"""hello""" '}";
+    f_1 = f"{'hello '}{a}{'"""hello"""'}";
+    f_2 = f"{'hello '}{a}{"'''hello'''"}";
+    print(len(b1),len(b_2), b_2,len(f_1), len(f_2)) ;
+    f_3 = f"{'"""again"""'}";
+    f_4 = f"{'"""again""" '}";
+    f_5 = f"{"'''again'''"}";
+    f_6 = f"{"'''again''' "}";
+    f_7 = f"{'"""again"""'}";
+    f_s1 = f"{'hello '}{a}{'"""hello"""'}";
+    f_s2 = f"{'hello '}{a}{"'''hello'''"}{'kklkl'}";
+    print(
+        len(f_3),
+        len(f_4),
+        len(f_5),
+        len(f_6),
+        len(f_7),
+        len(f_s1), len(f_s2)
+    ) ;
+    """sdfsdf\nsdfsdfsdfsd dffgdfgd.""" ;
+}
+can func() {;
+}

jaclang/tests/test_language.py

@@ -101,7 +101,7 @@ class JacLanguageTests(TestCase):
         stdout_value = captured_output.getvalue()
         self.assertEqual(
             stdout_value,
-            "<link href='{'new_val': 3, 'where': 'from_foo'} rel='stylesheet'\nTrue\n",
+            "<link href='{'new_val': 3, 'where': 'from_foo'}' rel='stylesheet'>\nTrue\n",
         )
 
     def test_chandra_bugs2(self) -> None:
@@ -212,6 +212,20 @@ class JacLanguageTests(TestCase):
         self.assertEqual(stdout_value.count(r"\\\\"), 2)
         self.assertEqual(stdout_value.count("<class 'bytes'>"), 3)
 
+    def test_fstring_multiple_quotation(self) -> None:
+        """Test fstring with multiple quotation."""
+        captured_output = io.StringIO()
+        sys.stdout = captured_output
+        jac_import(
+            "compiler/passes/main/tests/fixtures/fstrings",
+            base_path=self.fixture_abs_path("../../"),
+        )
+        sys.stdout = sys.__stdout__
+        stdout_value = captured_output.getvalue()
+        self.assertEqual(stdout_value.split("\n")[0], "11 13 12 12 11 12 12")
+        self.assertEqual(stdout_value.split("\n")[1], '12 12 """hello"""  18 18')
+        self.assertEqual(stdout_value.split("\n")[2], "11 12 11 12 11 18 23")
+
     def test_deep_imports(self) -> None:
         """Parse micro jac file."""
         captured_output = io.StringIO()
@@ -511,13 +525,11 @@ class JacLanguageTests(TestCase):
         self.assertIn("can greet2(**kwargs: Any)", output)
         self.assertEqual(output.count("with entry {"), 13)
         self.assertIn(
-            '"""Enum for shape types"""\nenum ShapeType{ CIRCLE = "Circle",\n',
+            '"""Enum for shape types"""\nenum ShapeType{ CIRCLE = \'Circle\',\n',
             output,
         )
-        self.assertIn(
-            "UNKNOWN = \"Unknown\",\n::py::\nprint('hello')\n::py::\n }", output
-        )
-        self.assertIn('assert x == 5 , "x should be equal to 5" ;', output)
+        self.assertIn("\nUNKNOWN = 'Unknown',\n::py::\nprint('hello')\n::", output)
+        self.assertIn("assert x == 5 , 'x should be equal to 5' ;", output)
         self.assertIn("if not x == y {", output)
         self.assertIn("can greet2(**kwargs: Any) {", output)
         self.assertIn("squares_dict = {x: (x ** 2)  for x in numbers};", output)
@@ -792,7 +804,7 @@ class JacLanguageTests(TestCase):
         settings.print_py_raised_ast = True
         ir = jac_pass_to_pass(py_ast_build_pass, schedule=py_code_gen_typed).ir
         jac_ast = ir.pp()
-        self.assertIn(' |   +-- String - "Loop compl', jac_ast)
+        self.assertIn(" |   +-- String - 'Loop completed normally{}'", jac_ast)
         self.assertEqual(len(ir.get_all_sub_nodes(ast.SubNodeList)), 269)
         captured_output = io.StringIO()
         sys.stdout = captured_output

{jaclang-0.7.21.dist-info → jaclang-0.7.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaclang
-Version: 0.7.21
+Version: 0.7.22
 Summary: Jac is a unique and powerful programming language that runs on top of Python, offering an unprecedented level of intelligence and intuitive understanding.
 Home-page: https://jaseci.org
 License: MIT

{jaclang-0.7.21.dist-info → jaclang-0.7.22.dist-info}/RECORD

@@ -6,7 +6,7 @@ jaclang/cli/cli.py,sha256=P2Hqzpb9q9uR_mbyFb8ojr3ff3oDbcP6m1G1kKWkR80,15911
 jaclang/cli/cmdreg.py,sha256=5mhzLJnpHfc0Z22qKQgcEOICgBaC95G9gSJZ-R7GqvU,8282
 jaclang/compiler/.gitignore,sha256=n1k2_xXTorp9PY8hhYM4psHircn-NMaFx95bSgDKopo,10
 jaclang/compiler/__init__.py,sha256=O1GO5Hb02vRlz7OpYHinQV5lQ7YuNUV9Hgjlc3QWtZg,2780
-jaclang/compiler/absyntree.py,sha256=6sFVBPhLJKopwfYYtK3-VQBh9AukXmmUGdE60FVyMaE,138072
+jaclang/compiler/absyntree.py,sha256=cBF837cKo7lUDzBX_dvzCf0pCOcq4eNsHgseIjgEvXk,139002
 jaclang/compiler/codeloc.py,sha256=YhJcHjhMCOT6mV1qLehwriuFgW0H2-ntq68k_r8yBs4,2800
 jaclang/compiler/compile.py,sha256=0d8p4i2LXg2RCu1XfWx_Jq_dx7pK2Zn2VIj-apvX_nI,3389
 jaclang/compiler/constant.py,sha256=gKccXK4Qf3CWuv8J1oaWrwqdP7CRIf7ndayquRx6Xgs,9007
@@ -22,7 +22,7 @@ jaclang/compiler/passes/main/fuse_typeinfo_pass.py,sha256=-rhK5SN9ORr7gTv9KVS1TG
 jaclang/compiler/passes/main/import_pass.py,sha256=9uoC_gxDs3FmLBBzQ8A1YQNHUlWQkAlKi55-AMkM3hs,12690
 jaclang/compiler/passes/main/py_collect_dep_pass.py,sha256=lzMOYH8TarhkJFt0vqvZFknthZ08OjsdO7tO2u2EN40,2834
 jaclang/compiler/passes/main/pyast_gen_pass.py,sha256=ACUhGsLq34N-Sfo96IAgkTnds9ZY6I7J6okr6rFvPpo,142105
-jaclang/compiler/passes/main/pyast_load_pass.py,sha256=k-tf5cZVlygDg4BGBYcAznO6w0hM4-0Pdzlwr4Sw48I,94027
+jaclang/compiler/passes/main/pyast_load_pass.py,sha256=DPbHECLOHmThoGvmHJCr3mjR21MMGtlY3dp_8S2-iPQ,94148
 jaclang/compiler/passes/main/pybc_gen_pass.py,sha256=CjA9AqyMO3Pv_b5Hh0YI6JmCqIru2ASonO6rhrkau-M,1336
 jaclang/compiler/passes/main/pyjac_ast_link_pass.py,sha256=1pW0uLEnhM5hCwVFAREdd_miyr3qTK0h_SJVfR_ryig,8604
 jaclang/compiler/passes/main/pyout_pass.py,sha256=QWVB-AyVBha3OespP89LMuslRsdG2niZErwtnRPiURM,3191
@@ -42,7 +42,7 @@ jaclang/compiler/passes/main/tests/fixtures/blip.jac,sha256=Fx9zqQ8VkiQ6vgzbQv9L
 jaclang/compiler/passes/main/tests/fixtures/codegentext.jac,sha256=U9xyk8hDlWM3jUaozQXOD61f5p9SI-_QfDxA68DUYds,562
 jaclang/compiler/passes/main/tests/fixtures/decls.jac,sha256=vPHNZeXuFKLclAFJfe92ajOX7n0ULsvEi5jBoDU-Ns8,123
 jaclang/compiler/passes/main/tests/fixtures/defs_and_uses.jac,sha256=zTTq_0u8ITmODu8rjRloI5Imwf2dICHdiKdOnzcgpbg,901
-jaclang/compiler/passes/main/tests/fixtures/fstrings.jac,sha256=h5bj-VWRv8g6POMVxQ1VPq6SI7QitZahAFMSmrp6Daw,75
+jaclang/compiler/passes/main/tests/fixtures/fstrings.jac,sha256=6QRZtTSuG1vIA7egTv-rY27U6HRaXeiOyuNs1sIU5Bk,1089
 jaclang/compiler/passes/main/tests/fixtures/func.jac,sha256=i175hPkR4tgf5SMZOrrCHjAE12mVlf6qUsu0mcJmJBE,297
 jaclang/compiler/passes/main/tests/fixtures/func2.jac,sha256=ZxgLe7VA57daLkqoB8MefdEE8dZIoFv2Dq-Zx-yHKxI,124
 jaclang/compiler/passes/main/tests/fixtures/game1.jac,sha256=oiTadkrYJRUo6ZkHUi7I54J_0GoTTtsNLhhofTlz0uY,263
@@ -291,7 +291,7 @@ jaclang/tests/fixtures/walker_update.jac,sha256=_bN3ASAN6LpfIQFfDMRnrx2oteM-ef7O
 jaclang/tests/fixtures/with_context.jac,sha256=cDA_4YWe5UVmQRgcpktzkZ_zsswQpV_T2Otf_rFnPy8,466
 jaclang/tests/test_bugs.py,sha256=tBPsIlSPqZDIz4QaScNRT-WdGIdJ0uU-aRBWq1XUZ6o,555
 jaclang/tests/test_cli.py,sha256=7PYJvJeKKb13yyP0TQ_pHbdRowWN5TI7kG-tNUESbaI,13461
-jaclang/tests/test_language.py,sha256=8eOyQeMJrMZbn8XZJqaddaajx4htlUJWvwPM1PTNubE,44376
+jaclang/tests/test_language.py,sha256=pe5GbGDvxX6u0uqCLtYCYR9SFtBswxfF0zZkKgUNQfw,45020
 jaclang/tests/test_man_code.py,sha256=ZdNarlZVfT_-8Jv3FjLplHw76tsvkCuISyfX3M4qxPg,5027
 jaclang/tests/test_reference.py,sha256=FISQpZbB8cmRoAeJOFfXUy13WVxykZjpkPSb1OTotfI,3340
 jaclang/tests/test_settings.py,sha256=TIX5uiu8H9IpZN2__uFiclcdCpBpPpcAwtlEHyFC4kk,1999
@@ -1525,7 +1525,7 @@ jaclang/vendor/typing_extensions-4.12.2.dist-info/METADATA,sha256=BeUQIa8cnYbrjW
 jaclang/vendor/typing_extensions-4.12.2.dist-info/RECORD,sha256=XS4fBVrPI7kaNZ56Ggl2RGa76jySWLqTzcrUpZIQTVM,418
 jaclang/vendor/typing_extensions-4.12.2.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
 jaclang/vendor/typing_extensions.py,sha256=gwekpyG9DVG3lxWKX4ni8u7nk3We5slG98mA9F3DJQw,134451
-jaclang-0.7.21.dist-info/METADATA,sha256=PHYewc1q1XV9rbxXxH3sxGKUdo4Tp6630L7bONTYsGY,4914
-jaclang-0.7.21.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-jaclang-0.7.21.dist-info/entry_points.txt,sha256=8sMi4Tvi9f8tQDN2QAXsSA2icO27zQ4GgEdph6bNEZM,49
-jaclang-0.7.21.dist-info/RECORD,,
+jaclang-0.7.22.dist-info/METADATA,sha256=RRjM8ycf_J5Kh88mQ0FqNAHngok4LAZhlMwJjMYkvSg,4914
+jaclang-0.7.22.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+jaclang-0.7.22.dist-info/entry_points.txt,sha256=8sMi4Tvi9f8tQDN2QAXsSA2icO27zQ4GgEdph6bNEZM,49
+jaclang-0.7.22.dist-info/RECORD,,