Fix whitespace in strings

Author: aothms

__init__.py

@@ -98,7 +98,7 @@ def build():
 omitted_parameter:STAR
 enumeration: "." keyword "."
 binary: "\"" ("0"|"1"|"2"|"3") (HEX)* "\"" 
-string: "'" (REVERSE_SOLIDUS REVERSE_SOLIDUS|SPECIAL|DIGIT|LOWER|UPPER|CONTROL_DIRECTIVE|"\\*\\")* "'" 
+string: "'" (REVERSE_SOLIDUS REVERSE_SOLIDUS|SPECIAL|DIGIT|SPACE|LOWER|UPPER|CONTROL_DIRECTIVE|"\\*\\")* "'"
 
 STAR: "*"
 SLASH: "/"
@@ -139,7 +139,7 @@ def build():
 INT: SIGN? DIGIT  (DIGIT)* 
 CONTROL_DIRECTIVE: PAGE | ALPHABET | EXTENDED2 | EXTENDED4 | ARBITRARY 
 PAGE : REVERSE_SOLIDUS "S" REVERSE_SOLIDUS LATIN_CODEPOINT
-LATIN_CODEPOINT : DIGIT | LOWER | UPPER | SPECIAL | REVERSE_SOLIDUS | APOSTROPHE
+LATIN_CODEPOINT : SPACE | DIGIT | LOWER | UPPER | SPECIAL | REVERSE_SOLIDUS | APOSTROPHE
 ALPHABET : REVERSE_SOLIDUS "P" UPPER REVERSE_SOLIDUS 
 EXTENDED2: REVERSE_SOLIDUS "X2" REVERSE_SOLIDUS (HEX_TWO)* END_EXTENDED 
 EXTENDED4 :REVERSE_SOLIDUS "X4" REVERSE_SOLIDUS (HEX_FOUR)* END_EXTENDED 
@@ -173,9 +173,9 @@ def build():
 ESCAPE    : "\\" ( "$" | "\"" | CHAR )
 CHAR      : /[^$"\n]/
 WORD      : CHAR+
-WS: /[ \t\f\r\n]/+
+SPACE.10  : " "
 
-%ignore WS
+%ignore /[ \t\f\r\n]/+
 """
 
 
@@ -205,7 +205,7 @@ def id(self, s):
         return int(s[0][1:])
 
     def string(self, s):
-        word = "".join(s)
+        word = "".join(s).replace("''", "'")
         return word
 
     def keyword(self, s):

fixtures/pass_1.ifc

@@ -5,10 +5,11 @@ FILE_NAME('','2022-05-04T08:08:30',(''),(''),'IfcOpenShell-0.7.0','IfcOpenShell-
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
-#1=IFCPERSON($,$,'',$,$,$,$,$);
+#1=IFCPERSON($, $,'',$,$,$,$,$);
 #2=IFCORGANIZATION($,'',$,$,$);
 #3=IFCPERSONANDORGANIZATION(#1,#2,$);
 #4=IFCAPPLICATION(#2,'0.7.0','IfcOpenShell-0.7.0','');
+#100=IFCAPPLICATION(#2,'0.7.0','Nested '' quotes','');
 #5=IFCOWNERHISTORY(#3,#4,$,.ADDED.,$,#3,#4,1651651710);
 #6=IFCDIRECTION((1.,0.,0.));
 #7=IFCDIRECTION((0.,0.,1.));

test_parser.py

@@ -30,3 +30,5 @@ def test_parse_features():
     assert f.by_id(1).type == 'IFCPERSON'
     assert f.by_type('ifcperson')[0].id == 1
     assert f[1][0] is None
+    assert f.header.file_description[0][0] == 'ViewDefinition [CoordinationView]'
+    assert f.by_type('ifcapplication')[1][2] == "Nested ' quotes"