WIP: Add global function call logic to meta examples

shogun-toolbox · Jul 9, 2017 · bc8aee1 · bc8aee1
1 parent 728a9f5
commit bc8aee1
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 1 deletion.
diff --git a/examples/meta/generator/parse.py b/examples/meta/generator/parse.py
@@ -213,6 +213,10 @@ def p_staticCall(self, p):
         "staticCall : type COLON identifier LPAREN argumentList RPAREN"
         p[0] = {"StaticCall": [p[1], p[3], p[5]]}
 
+    def p_globalCall(self, p):
+        "globalCall : identifier LPAREN argumentList RPAREN"
+        p[0] = {"GlobalCall": [p[1], p[3]]}
+
     def p_indexList(self, p):
         """
         indexList : int
@@ -262,6 +266,7 @@ def p_expr(self, p):
         expr : enum
              | methodCall
              | staticCall
+             | globalCall
              | elementAccess
              | string
              | char

diff --git a/examples/meta/generator/targets/cpp.json b/examples/meta/generator/targets/cpp.json
@@ -85,6 +85,7 @@
         "FloatLiteral": "${number}f",
         "MethodCall": "$object->$method($arguments)",
         "StaticCall": "C$typeName::$method($arguments)",
+        "GlobalCall": "$method($arguments)",
         "Identifier": "$identifier",
         "Enum":"$typeName::$value"
     },

diff --git a/examples/meta/generator/targets/csharp.json b/examples/meta/generator/targets/csharp.json
@@ -70,6 +70,7 @@
         "FloatLiteral": "${number}f",
         "MethodCall": "$object.$method($arguments)",
         "StaticCall": "$typeName.$method($arguments)",
+        "GlobalCall": "$method($arguments)",
         "Identifier": "$identifier",
         "Enum":"$typeName.$value"
     },

diff --git a/examples/meta/generator/targets/java.json b/examples/meta/generator/targets/java.json
@@ -75,6 +75,7 @@
         "FloatLiteral": "${number}f",
         "MethodCall": "$object.$method($arguments)",
         "StaticCall": "$typeName.$method($arguments)",
+        "GlobalCall": "$method($arguments)",
         "Identifier": "$identifier",
         "Enum":"$typeName.$value"
     },

diff --git a/examples/meta/generator/targets/lua.json b/examples/meta/generator/targets/lua.json
@@ -22,6 +22,7 @@
         "FloatLiteral": "$number",
         "MethodCall": "$object:$method($arguments)",
         "StaticCall": "$typeName:$method($arguments)",
+        "GlobalCall": "$method($arguments)",
         "Identifier": "$identifier",
         "Enum":"shogun.$value"
     },

diff --git a/examples/meta/generator/targets/octave.json b/examples/meta/generator/targets/octave.json
@@ -40,6 +40,7 @@
         "FloatLiteral": "$number",
         "MethodCall": "$object.$method($arguments)",
         "StaticCall": "$typeName.$method($arguments)",
+        "GlobalCall": "$method($arguments)",
         "Identifier": "$identifier",
         "Enum":"$value"
     },

diff --git a/examples/meta/generator/targets/python.json b/examples/meta/generator/targets/python.json
@@ -50,6 +50,7 @@
         "FloatLiteral": "$number",
         "MethodCall": "$object.$method($arguments)",
         "StaticCall": "$typeName.$method($arguments)",
+        "GlobalCall": "$method($arguments)",
         "Identifier": "$identifier",
         "Enum":"$value"
     },

diff --git a/examples/meta/generator/targets/r.json b/examples/meta/generator/targets/r.json
@@ -22,6 +22,7 @@
         "FloatLiteral": "$number",
         "MethodCall": "$object$$$method($arguments)",
         "StaticCall": "$typeName$$$method($arguments)",
+        "GlobalCall": "$method($arguments)",
         "Identifier": "$identifier",
         "Enum":"\"$value\""
     },

diff --git a/examples/meta/generator/targets/ruby.json b/examples/meta/generator/targets/ruby.json
@@ -42,6 +42,7 @@
         "FloatLiteral": "$number",
         "MethodCall": "$object.$method $arguments",
         "StaticCall": "Shogun::$typeName.$method $arguments",
+        "GlobalCall": "Shogun::$method $arguments",
         "Identifier": "$identifier",
         "Enum":"Shogun::$value"
     },

diff --git a/examples/meta/generator/translate.py b/examples/meta/generator/translate.py
@@ -465,6 +465,19 @@ def translateExpr(self, expr):
                                        method=method,
                                        arguments=translatedArgsList)
 
+        elif key == "GlobalCall":
+            template = Template(self.targetDict["Expr"]["GlobalCall"])
+            method = expr[key][0]["Identifier"]
+            argsList = None
+            try:
+                argsList = expr[key][2]
+            except IndexError:
+                pass
+            translatedArgsList = self.translateArgumentList(argsList)
+
+            return template.substitute(method=method,
+                                       arguments=translatedArgsList)
+
         elif key == "ElementAccess":
             return self.translateElementAccess(expr[key])
 

diff --git a/examples/meta/src/multiclass_classifier/multiclass_ecoc_random.sg b/examples/meta/src/multiclass_classifier/multiclass_ecoc_random.sg
@@ -1,8 +1,10 @@
+Math:init_random(1)
+get_global_io()
+
 CSVFile f_feats_train("../../data/classifier_4class_2d_linear_features_train.dat")
 CSVFile f_feats_test("../../data/classifier_4class_2d_linear_features_test.dat")
 CSVFile f_labels_train("../../data/classifier_4class_2d_linear_labels_train.dat")
 CSVFile f_labels_test("../../data/classifier_4class_2d_linear_labels_test.dat")
-Math:init_random(1)
 
 #![create_features]
 RealFeatures features_train(f_feats_train)