Changeset 177

Timestamp:

04/11/08 19:38:03 (9 months ago)

Author:

tal

Message:

Added support for lookup and feature references.

Files:

• packages/feaTools/trunk/Lib/feaTools/parser.py (modified) (2 diffs)
• packages/feaTools/trunk/Lib/feaTools/test.py (modified) (2 diffs)
• packages/feaTools/trunk/Lib/feaTools/writers/baseWriter.py (modified) (1 diff)

packages/feaTools/trunk/Lib/feaTools/parser.py

@@ -192 +192 @@
-    "\s*;"                 # ;
-)
+
+# used for finding feature references
+featureReferenceRE = re.compile(
+        "([\s;\{\}]|^)"        # whitepace, ; {, } or start of line
+        "feature\s+"           # feature
+        "([\w\d]{4})"          # name
+        "\s*;"                 # {
+        )
+
+# used for finding lookup references
+lookupReferenceRE = re.compile(
+        "([\s;\{\}]|^)"        # whitepace, ; {, } or start of line
+        "lookup\s+"            # lookup
+        "([\w\d]+)"            # name
+        "\s*;"                 # {
+        )
+
+
-
-def _parseUnknown(writer, text):
@@ -290 +308 @@
-        text = _executeSimpleSlice(precedingMark, text, includeRE, writer)
-        writer.include(path)
+    # feature reference
+    featureReferences = featureReferenceRE.findall(text)
+    for precedingMark, featureName in featureReferences:
+        text = _executeSimpleSlice(precedingMark, text, featureReferenceRE, writer)
+        writer.featureReference(featureName)
+    # lookup reference
+    lookupReferences = lookupReferenceRE.findall(text)
+    for precedingMark, lookupName in lookupReferences:
+        text = _executeSimpleSlice(precedingMark, text, lookupReferenceRE, writer)
+        writer.lookupReference(lookupName)
-    # subtable
-    subtables = subtableRE.findall(text)

packages/feaTools/trunk/Lib/feaTools/test.py

@@ -60 +60 @@
-    def include(self, path):
-        self._instructions.append(("include", (path)))
+
+    def subtableBreak(self):
+        self._instructions.append(("subtableBreak", None))
+
+    def lookupReference(self, name):
+        self._instructions.append(("lookupReference", name))
+
+    def featureReference(self, name):
+        self._instructions.append(("featureReference", name))
-
-
@@ -578 +587 @@
-        self.assertEqual(result, expected)
-
+    def testSubtableBreak(self):
+        test = """subtable;"""
+        writer = TestFeatureWriter()
+        parseFeatures(writer, test)
+        result = writer.getData()
+        expected = [
+                ("subtableBreak", None)
+                ]
+        self.assertEqual(result, expected)
+        #
+        test = """subtable;subtable;"""
+        writer = TestFeatureWriter()
+        parseFeatures(writer, test)
+        result = writer.getData()
+        expected = [
+                ("subtableBreak", None),
+                ("subtableBreak", None)
+                ]
+        self.assertEqual(result, expected)
+
+    def testFeatureReference(self):
+        test = """feature fooo;"""
+        writer = TestFeatureWriter()
+        parseFeatures(writer, test)
+        result = writer.getData()
+        expected = [
+                ("featureReference", "fooo")
+                ]
+        self.assertEqual(result, expected)
+        #
+        test = """feature barr {feature fooo;} barr;"""
+        writer = TestFeatureWriter()
+        parseFeatures(writer, test)
+        result = writer.getData()
+        expected = [("feature", ("barr", [("featureReference", "fooo")]))]
+        self.assertEqual(result, expected)
+
+    def testLookupReference(self):
+        test = """lookup foo;"""
+        writer = TestFeatureWriter()
+        parseFeatures(writer, test)
+        result = writer.getData()
+        expected = [
+                ("lookupReference", "foo")
+                ]
+        self.assertEqual(result, expected)
+        #
+        test = """lookup bar {lookup foo;} bar;"""
+        writer = TestFeatureWriter()
+        parseFeatures(writer, test)
+        result = writer.getData()
+        expected = [("lookup", ("bar", [("lookupReference", "foo")]))]
+        self.assertEqual(result, expected)
+
-
-if __name__ == "__main__":

packages/feaTools/trunk/Lib/feaTools/writers/baseWriter.py

@@ -5 +5 @@
-
-    def lookup(self, name):
+        raise NotImplementedError
+
+    def featureReference(self, name):
+        raise NotImplementedError
+
+    def lookupReference(self, name):
-        raise NotImplementedError
-