completing py2/py3 integration

Author: jonathf

src/matlab2cpp/__init__.py

@@ -30,11 +30,9 @@
 
 
 The simplest way to use the library is to use the quick translation functions.
-They are available through the `mc.qfunctions` module and mirrors the
+They are available through the `matlab2cpp.qfunctions` module and mirrors the
 functionality offered by the `m2cpp` function.
 """
-__version__ = "2.0"
-
 try:
     import argcomplete
 except ImportError:
@@ -43,6 +41,8 @@
 from .parser import create_parser
 from .qfunctions import *
 
+__version__ = "2.0"
+
 
 def m2cpp(args=None):
     """

src/matlab2cpp/collection.py

@@ -217,7 +217,7 @@ def __init__(self, name="", cur=0, line=0, code="", **kws):
 Children:
     `Program+`
 
-All keyword arguments are passed to `mc.Node.__init__`.
+All keyword arguments are passed to `matlab2cpp.Node.__init__`.
     """
         assert "parent" not in kws
         self.parent = self
@@ -234,7 +234,7 @@ def __init__(self, parent, name, **kws):
 Children:
     `Includes Funcs Inlines Structs Headers Log`
 
-All keyword arguments are passed to `mc.Node.__init__`.
+All keyword arguments are passed to `matlab2cpp.Node.__init__`.
     """
         self._program = self
         Node.__init__(self, parent, name=name, **kws)

src/matlab2cpp/configure/__init__.py

@@ -1,76 +1,2 @@
-from . import tree, datatypes, backends, reserved
-
-
-def configure(root, suggest=True, **kws):
-    """
-configure backend
-
-See also:
-    :py:func:`matlab2cpp.Builder.configure <Builder.configure>`
-    """
-    if isinstance(root, tree.Builder):
-        root = root.project
-
-    loop(root, suggest)
-    loop(root, suggest)
-
-def loop(root, suggest):
-
-    nodes = root.flatten(False, True, True)
-
-    while True:
-        
-        # loop and configure
-        for node in nodes:
-
-            # reserved stuff
-            if node.cls + "_" + node.name in reserved.__dict__:
-                rule = reserved.__dict__[node.cls+"_"+node.name]
-                if isinstance(rule, str):
-                    node.type = rule
-                else:
-                    rule(node)
-
-            # Datatype stuff
-            if node.prop["type"] != "TYPE":
-                pass
-
-            elif node.cls in datatypes.__dict__:
-                datatype = datatypes.__dict__[node.cls]
-                if isinstance(datatype, str):
-                    node.type = datatype
-                else:
-                    datatype(node)
-
-            # Backend stuff
-            if node.backend != "unknown":
-                pass
-
-            elif node.cls in backends.__dict__:
-                backend = backends.__dict__[node.cls]
-                if isinstance(backend, str):
-                    node.backend = backend
-                else:
-                    backend(node)
-
-        # determine if done
-        if suggest:
-
-            complete = True
-
-            for program in root.project:
-                
-                suggests = program.suggest
-                program.stypes = suggests
-                program.ftypes = suggests
-                complete = complete and not any([any(v) for v in suggests.values()])
-
-            if complete:
-                break
-
-        else:
-            break
-
-    # delete log, if any (create on translate)
-    for program in root.project:
-        program[-1].children = []
+from .frontend import configure, loop
+from . import datatypes, backends, reserved

src/matlab2cpp/configure/armadillo.py

@@ -1,4 +1,5 @@
-import matlab2cpp.rules.armadillo as arma
+from ..rules import armadillo as arma
+
 
 def vec(node):
     if len(node) != 1:
@@ -12,7 +13,7 @@ def vec(node):
         else:
             return
 
-    
+
     arg, dim = arma.configure_arg(node[0], 0)
 
     if dim == 0:
@@ -31,8 +32,8 @@ def rowvec(node):
             return
     else:
         node_ = node[0]
-        
-    
+
+
     arg, dim = arma.configure_arg(node_, 0)
 
     if dim == 0:
@@ -43,7 +44,7 @@ def mat(node):
     if len(node) == 1:
 
         arg, dim = arma.configure_arg(node[0], 0)
-        
+
         # scalar begets scalar
         if dim == 0:
             node.dim = 0

src/matlab2cpp/configure/backends.py

@@ -93,7 +93,7 @@ def Matrix(node):
 def Fvar(node):
     """
 Example:
-    >>> print(mc.qtree("a.b = 4.4; c = [a.b]", core=True, suggest=True)) #doctest: +NORMALIZE_WHITESPACE
+    >>> print(matlab2cpp.qtree("a.b = 4.4; c = [a.b]", core=True, suggest=True)) #doctest: +NORMALIZE_WHITESPACE
     1   1Block      code_block   TYPE    
     1   1| Assign     double       double  
     1   1| | Fvar       struct       double  a

src/matlab2cpp/configure/datatypes.py

@@ -1,14 +1,13 @@
 
 from .funcs import funcs
-from . import armadillo, backends
-from .configure import configure
+from . import armadillo, backends, frontend
 
 Counter = "structs"
 
 def Var(node):
     """
 Example:
-    >>> print(mc.qcpp("a.b = 4; c = a"))
+    >>> print(matlab2cpp.qcpp("a.b = 4; c = a"))
     #include <armadillo>
     using namespace arma ;
     <BLANKLINE>
@@ -167,7 +166,7 @@ def Assign(node):
         return
     node.type = node[1].type
     # node[0].declare.suggest = node[1].type
-    
+
 
 def Vector(node):
 
@@ -212,11 +211,11 @@ def Vector(node):
         node.dim = 2
 
     # mix of scalars and rowvecs
-    elif dims == {0,2}:
+    elif dims == {0, 2}:
         node.dim = 2
 
     # mix of matrices and colvecs
-    elif dims in ({3}, {1,3}):
+    elif dims in ({3}, {1, 3}):
         node.dim = 3
 
 def Matrix(node):
@@ -305,6 +304,8 @@ def Minus(node):
 
 def Mul(node):
     opr(node)
+    if "TYPE" in (n.type for n in node):
+        return
     mem = max([n.mem for n in node])
     if node[0].dim == 2 and node[1].dim == 1:
         node.type = (0, mem)
@@ -406,7 +407,7 @@ def Lambda(node):
                     node_.type = type
                     node_.declare.type = type
 
-    configure(lfunc)
+    frontend.configure(lfunc)
     # declare list in lambda function
     if ldeclares["_retval"].type != "TYPE":
         declares[node.name[1:]].type = "func_lambda"

src/matlab2cpp/configure/funcs.py

@@ -7,7 +7,7 @@ def funcs(node):
     # lambda scope
     if "_" + node.name in node.program[1]:
         func = node.program[1]["_" + node.name]
-    
+
     # local scope
     elif node in node.program[1]:
         func = node.program[1][node]
@@ -76,4 +76,4 @@ def funcs(node):
             params[i].suggest = node[i].type
 
     return True
-        
+