Changeset 179

Timestamp:

04/11/08 23:21:22 (9 months ago)

Author:

tal

Message:

Ignore table blocks.

Files:

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

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

@@ -68 +68 @@
-        ]
-
+# used for finding all table names.
+table_findAll_RE = re.compile(
+        "([\s;\{\}]|^)"        # whitepace, ; {, } or start of line
+        "table\s+"             # table
+        "([\w\d]{4})"          # name
+        "\s*{"                 # {
+        )
+
+# used for finding the content of tables.
+# this regular expression will be compiled
+# for each table name found.
+tableContentRE = [
+        "([\s;\{\}]|^)",       # whitepace, ; {, } or start of line
+        "table\s+",            # feature
+        # table name           # name
+        "\s*\{",               # {
+        "([\S\s]*)",           # content
+        "}\s*",                # }
+        # table name           # name
+        "\s*;"                 # ;
+        ]
+
-# used for finding all class definitions.
-classDefinitionRE = re.compile(
@@ -220 +242 @@
-def _parseUnknown(writer, text):
-    text = text.strip()
+    ## extract all table names
+    tableNames = table_findAll_RE.findall(text)
+    for precedingMark, tableName in tableNames:
+        # a regular expression specific to this lookup must
+        # be created so that nested lookups are safely handled
+        thisTableContentRE = list(tableContentRE)
+        thisTableContentRE.insert(2, tableName)
+        thisTableContentRE.insert(6, tableName)
+        thisTableContentRE = re.compile("".join(thisTableContentRE))
+        found = thisTableContentRE.search(text)
+        tableText = found.group(2)
+        start, end = found.span()
+        precedingText = text[:start]
+        if precedingMark:
+            precedingText += precedingMark
+        _parseUnknown(writer, precedingText)
+        _parseTable(writer, tableName, tableText)
+        text = text[end:]
-    ## extract all feature names
-    featureNames = feature_findAll_RE.findall(text)
@@ -352 +392 @@
-    parsed = _parseUnknown(lookupWriter, lookup)
-
+def _parseTable(writer, name, table):
+    # this could parse table secific data.
+    # for now, simply ignore the text.
+    pass
+
-def _parseClass(writer, name, content):
-    content = classContentRE.findall(content)

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

@@ -188 +188 @@
-                ("lookup", ("TEST", []))
-                ]))]
+        self.assertEqual(result, expected)
+
+    def testTableBlocks(self):
+        test = """
+        table test {
+        } test;
+        """
+        writer = TestFeatureWriter()
+        parseFeatures(writer, test)
+        result = writer.getData()
+        expected = []
+        self.assertEqual(result, expected)
+        #
+        test = """
+        table test{}test;
+        """
+        writer = TestFeatureWriter()
+        parseFeatures(writer, test)
+        result = writer.getData()
+        expected = []
+        self.assertEqual(result, expected)
+        #
+        test = """
+        table test {
+            lookup TEST {} TEST;
+        } test;
+        """
+        writer = TestFeatureWriter()
+        parseFeatures(writer, test)
+        result = writer.getData()
+        expected = []
+        self.assertEqual(result, expected)
+        #
+        test = """
+        table test {
+            feature TEST {} TEST;
+        } test;
+        """
+        writer = TestFeatureWriter()
+        parseFeatures(writer, test)
+        result = writer.getData()
+        expected = []
-        self.assertEqual(result, expected)
-