Fix #98; correctly read var-properties in MRS-JSON

This was eluding the unit tests because:
  - Xmrs.__eq__() didn't check variable properties (now fixed)
  - The unit test didn't include variable properties (also fixed)

CHANGELOG.md

@@ -22,6 +22,8 @@
 * `delphin.interfaces.ace` joins content lines in tsdb mode---fixes #95
 * Write empty tables for `delphin mkprof` command unless `--skeleton` is
   used (fixes #96)
+* `delphin.mrs.xmrs.Xmrs` equality test now checks variable properties
+* `delphin.mrs.xmrs.Mrs.from_dict()` correctly reads variable properties (#98)
 
 ### Deprecated
 

delphin/mrs/xmrs.py

@@ -227,6 +227,9 @@ def __eq__(self, other):
         a, b = sorted(self.icons()), sorted(other.icons())
         if len(a) != len(b) or any(ic1 != ic2 for ic1, ic2 in zip(a, b)):
             return False
+        for v in self.variables():
+            if self.properties(v) != other.properties(v):
+                return False
         return True
 
     @property
@@ -832,7 +835,7 @@ def _ep(ep):
                  for c in d.get('constraints', []) if 'high' in c]
         icons = [(c['high'], c['relation'], c['low'])
                  for c in d.get('constraints', []) if 'left' in c]
-        variables = {var: {k:v for k, v in data.items() if k != 'type'}
+        variables = {var: list(data.get('properties', {}).items())
                      for var, data in d.get('variables', {}).items()}
         return cls(
             top=d.get('top'),

tests/mrs_Mrs_test.py

@@ -120,11 +120,16 @@ def test_from_dict(self):
                  'arguments': {'ARG0': 'e2'}}
             ],
             'constraints': [],
-            'variables': {'h1': {'type': 'h'}, 'e2': {'type': 'e'}}
+            'variables': {
+                'h1': {'type': 'h'},
+                'e2': {'type': 'e',
+                       'properties': {'SF': 'prop', 'TENSE': 'pres'}}
+            }
         })
         m2 = Mrs(
             rels=[
                 EP(FIRST_NODEID, sp('"_rain_v_1_rel"'), 'h1', {'ARG0': 'e2'})
-            ]
+            ],
+            vars={'e2': {'SF': 'prop', 'TENSE': 'pres'}}
         )
         assert m1 == m2