Everything works with full tests.

Author: jpivarski

histogrammar/util.py

@@ -247,13 +247,18 @@ def function(datum):
                         except AttributeError:
                             v, = varname                       # otherwise, use the one and only variable
                             if v is None:                      # as the object (only discover it once)
-                                try:
-                                    v, = set(c.co_names) - set(context.keys())
-                                except ValueError:
+                                v = set(c.co_names) - set(context.keys())
+                                if len(v) > 1:
                                     raise NameError("more than one unrecognized variable names in single-argument function: {0}".format(set(c.co_names) - set(context.keys())))
+                                elif len(v) == 0:
+                                    v = None
+                                else:
+                                    v = list(v)[0]
+
                                 varname[0] = v
 
-                            context.update({v: datum})
+                            if v is not None:
+                                context.update({v: datum})
 
                     return eval(c, context)
 

test/testbasic.py

@@ -21,7 +21,7 @@
 
 from histogrammar import *
 
-class TestOriginal(unittest.TestCase):
+class TestBasic(unittest.TestCase):
     simple = [3.4, 2.2, -1.8, 0.0, 7.3, -4.7, 1.6, 0.0, -3.0, -1.7]
 
     class Struct(object):

test/testspec.py

@@ -38,16 +38,24 @@ def compare(self, x, y, name):
                 else:
                     sys.stderr.write("{0:50s} | {1}\n".format(leftline, rightline))
             self.assertEqual(Factory.fromJson(x), Factory.fromJson(y))
-
+        
     def runTest(self):
         testdata = json.load(open("../histogrammar-multilang/test-data.json"))
         for x in testdata:
             for k, v in x.items():
                 if k != "strings" and v in ("nan", "inf", "-inf"):
                     x[k] = float(v)
-
+        
         testresults = json.load(open("../histogrammar-multilang/test-results.json"))
 
+        def stripNames(x):
+            if hasattr(x, "quantity"):
+                x.quantity.name = None
+            elif hasattr(x, "quantityName"):
+                x.quantityName = None
+            for xi in x.children:
+                stripNames(xi)
+
         for testresult in testresults:
             sys.stderr.write(testresult["expr"] + "\n")
 
@@ -57,15 +65,48 @@ def runTest(self):
 
             h1 = eval(testresult["expr"])
             h2 = eval(testresult["expr"])
+
             self.compare(h1.toJson(), zero, "NAMED ZERO")
+            self.compare((h1 + h1).toJson(), zero, "NAMED ZERO + ZERO")
+            self.compare(h1.zero().toJson(), zero, "NAMED ZERO.zero()")
 
             for x in testdata:
                 h1.fill(x)
                 h2.fill(x)
             self.compare(h1.toJson(), one, "NAMED ONE")
+            self.compare(h1.zero().toJson(), zero, "NAMED ONE.zero()")
+            self.compare((h1 + h1.zero()).toJson(), one, "NAMED ONE + ZERO")
+            self.compare((h1.zero() + h1).toJson(), one, "NAMED ZERO + ONE")
 
             self.compare((h1 + h2).toJson(), two, "NAMED TWO VIA PLUS")
 
             for x in testdata:
                 h1.fill(x)
             self.compare(h1.toJson(), two, "NAMED TWO VIA FILL")
+
+            zero = testresult["zero-anonymous"]
+            one = testresult["one-anonymous"]
+            two = testresult["two-anonymous"]
+
+            h1 = eval(testresult["expr"])
+            stripNames(h1)
+            h2 = eval(testresult["expr"])
+            stripNames(h2)
+
+            self.compare(h1.toJson(), zero, "ANONYMOUS ZERO")
+            self.compare((h1 + h1).toJson(), zero, "ANONYMOUS ZERO + ZERO")
+            self.compare(h1.zero().toJson(), zero, "ANONYMOUS ZERO.zero()")
+
+            for x in testdata:
+                h1.fill(x)
+                h2.fill(x)
+            self.compare(h1.toJson(), one, "ANONYMOUS ONE")
+            self.compare(h1.zero().toJson(), zero, "ANONYMOUS ONE.zero()")
+            self.compare((h1 + h1.zero()).toJson(), one, "ANONYMOUS ONE + ZERO")
+            self.compare((h1.zero() + h1).toJson(), one, "ANONYMOUS ZERO + ONE")
+
+            self.compare((h1 + h2).toJson(), two, "ANONYMOUS TWO VIA PLUS")
+
+            for x in testdata:
+                h1.fill(x)
+            self.compare(h1.toJson(), two, "ANONYMOUS TWO VIA FILL")