Reorganize

Author: ftomassetti

pylasu/customserialization/__init__.py

@@ -1,16 +1,19 @@
 import contextlib
 
-from .model.naming import ReferenceByName
-from .model.position import Point, Position
-from .validation.validation import Result, Issue, IssueType, IssueSeverity
+from pylasu.model.naming import ReferenceByName
+from pylasu.model.position import Point, Position
+from pylasu.validation.validation import Result, Issue, IssueType, IssueSeverity
+from deprecated import deprecated
 
 
+@deprecated(reason="Use LionWeb serialization instead")
 def unserialize_result(json_result, root_unserializer) -> Result:
     result = Result(root=root_unserializer(json_result['root']) if 'root' in json_result else None)
     result.issues = [unserialize_issue(issue) for issue in json_result['issues']] if 'issues' in json_result else []
     return result
 
 
+@deprecated(reason="Use LionWeb serialization instead")
 def unserialize_issue(json_issue) -> Issue:
     return Issue(
         type=unserialize_issue_type(json_issue['type']) if json_issue['type'] else None,
@@ -20,42 +23,49 @@ def unserialize_issue(json_issue) -> Issue:
     )
 
 
+@deprecated(reason="Use LionWeb serialization instead")
 def unserialize_issue_type(json_issue_type) -> IssueType or None:
     with contextlib.suppress(Exception):
         return IssueType[json_issue_type]
 
 
+@deprecated(reason="Use LionWeb serialization instead")
 def unserialize_issue_severity(json_issue_severity) -> IssueSeverity:
     with contextlib.suppress(Exception):
         return IssueSeverity[json_issue_severity]
 
 
+@deprecated(reason="Use LionWeb serialization instead")
 def check_type(json, expected_type):
     if "#type" not in json:
         raise Exception("type not specified, expected %s" % expected_type)
     if json["#type"] != expected_type:
         raise Exception("unexpected type, expected %s but found %s" % (expected_type, json["#type"]))
 
 
+@deprecated(reason="Use LionWeb serialization instead")
 def unserialize_point(json_point):
     return Point(
         line=json_point['line'] if 'line' in json_point else None,
         column=json_point['column'] if 'column' in json_point else None,
     )
 
 
+@deprecated(reason="Use LionWeb serialization instead")
 def unserialize_position(json_position):
     return Position(
         start=unserialize_point(json_position['start']) if 'start' in json_position else None,
         end=unserialize_point(json_position['end']) if 'end' in json_position else None
     )
 
 
+@deprecated(reason="Use LionWeb serialization instead")
 def unserialize_reference_by_name(json_reference_by_name):
     return ReferenceByName(
         name=json_reference_by_name['name'] if 'name' in json_reference_by_name else None
     )
 
 
+@deprecated(reason="Use LionWeb serialization instead")
 def unserialize_long(json):
     return json

pylasu/astruntime.py pylasu/customserialization/astruntime.pypylasu/astruntime.py renamed to pylasu/customserialization/astruntime.py

@@ -4,7 +4,7 @@
 from pyecore.resources import Resource
 
 from pylasu.model import Node
-from pylasu.support import extension_method
+from pylasu.reflection.support import extension_method
 
 from deprecated import deprecated
 

pylasu/emf/model.py

@@ -155,34 +155,7 @@ def _generate_constructor(concept: Concept) -> ast.FunctionDef:
                 func=ast.Attribute(value=ast.Name(id='self', ctx=ast.Load()), attr='set_id', ctx=ast.Load()),
                 args=[ast.Name(id='id', ctx=ast.Load())],
                 keywords=[]
-            )),
-            # # self._set_containment_single_value(..., ...)
-            # ast.Expr(value=ast.Call(
-            #     func=ast.Attribute(
-            #         value=ast.Name(id='self', ctx=ast.Load()),
-            #         attr='_set_containment_single_value',
-            #         ctx=ast.Load()
-            #     ),
-            #     args=[],
-            #     keywords=[
-            #         ast.keyword(
-            #             arg='containment',
-            #             value=ast.Call(
-            #                 func=ast.Attribute(
-            #                     value=ast.Name(id='concept', ctx=ast.Load()),
-            #                     attr='get_containment_by_name',
-            #                     ctx=ast.Load()
-            #                 ),
-            #                 args=[ast.Constant(value='externalName')],
-            #                 keywords=[]
-            #             )
-            #         ),
-            #         ast.keyword(
-            #             arg='value',
-            #             value=ast.Name(id='externalName', ctx=ast.Load())
-            #         )
-            #     ]
-            # ))
+            ))
         ],
         decorator_list=[],
         returns=None

pylasu/lionweb/ast_generation.py

@@ -3,7 +3,7 @@
 
 from . import walk
 from .model import Node, internal_property
-from ..support import extension_method
+from pylasu.reflection.support import extension_method
 
 
 @extension_method(Node)

pylasu/model/processing.py

@@ -2,7 +2,7 @@
 
 from . import Position
 from .model import Node
-from ..support import extension_method
+from pylasu.reflection.support import extension_method
 
 
 @extension_method(Node)

pylasu/model/traversing.py

@@ -7,7 +7,7 @@
 from pylasu.model import Origin, Position, Point
 from pylasu.model.model import internal_property, Node
 from pylasu.model.position import Source
-from pylasu.support import extension_method
+from pylasu.reflection.support import extension_method
 
 import inspect
 

pylasu/parsing/parse_tree.py

@@ -6,7 +6,7 @@
 from pylasu.model.model import node_property, node_containment
 from pylasu.model.reflection import Multiplicity, PropertyDescription
 from pylasu.model.naming import ReferenceByName, Named, Scope, Symbol
-from pylasu.support import extension_method
+from pylasu.reflection.support import extension_method
 
 
 @dataclasses.dataclass