commit 006741bbe5d3a38d8663ece776968e449fde2794
author Prerak Mann <31154435+mannprerak2@users.noreply.github.com> Mon Aug 03 14:22:50 2020 +0530
committer GitHub <noreply@github.com> Mon Aug 03 10:52:50 2020 +0200
tree 2184e6dd37e2bbac510388ade9c9adc8d8794f24
parent c5d2d968b90ad0f31b65c895c7844e0c30463669

Escaped special characters $ and ' from string macros. (#64)

lib/src/header_parser/sub_parsers/macro_parser.dart

diff --git a/lib/src/header_parser/sub_parsers/macro_parser.dart b/lib/src/header_parser/sub_parsers/macro_parser.dart
index 3971daf..87bb642 100644
--- a/lib/src/header_parser/sub_parsers/macro_parser.dart
+++ b/lib/src/header_parser/sub_parsers/macro_parser.dart
@@ -132,12 +132,16 @@
           );
           break;
         case clang_types.CXEvalResultKind.CXEval_StrLiteral:
+          var value = Utf8.fromUtf8(clang.clang_EvalResult_getAsStr(e).cast());
+          // Escape $ character.
+          value = value.replaceAll(r'$', r'\$');
+          // Escape ' character, because our strings are enclosed with '.
+          value = value.replaceAll("'", r"\'");
           constant = Constant(
             originalName: _savedMacros[macroName],
             name: macroName,
             rawType: 'String',
-            rawValue:
-                "'${Utf8.fromUtf8(clang.clang_EvalResult_getAsStr(e).cast())}'",
+            rawValue: "'${value}'",
           );
           break;
       }

test/header_parser_tests/macros.h

diff --git a/test/header_parser_tests/macros.h b/test/header_parser_tests/macros.h
index b405db4..d75bcca 100644
--- a/test/header_parser_tests/macros.h
+++ b/test/header_parser_tests/macros.h
@@ -14,3 +14,7 @@
 #define TEST7(x, y) x *y
 
 #define TEST8 5,2,3
+
+// These tests that special characters are escaped properly.
+#define TEST9 "$dollar"
+#define TEST10 "test's"

test/header_parser_tests/macros_test.dart

diff --git a/test/header_parser_tests/macros_test.dart b/test/header_parser_tests/macros_test.dart
index 74bbcfc..e358873 100644
--- a/test/header_parser_tests/macros_test.dart
+++ b/test/header_parser_tests/macros_test.dart
@@ -64,6 +64,14 @@
       expect(actual.getBindingAsString('TEST8'),
           expected.getBindingAsString('TEST8'));
     });
+    test('TEST9', () {
+      expect(actual.getBindingAsString('TEST9'),
+          expected.getBindingAsString('TEST9'));
+    });
+    test('TEST10', () {
+      expect(actual.getBindingAsString('TEST10'),
+          expected.getBindingAsString('TEST10'));
+    });
   });
 }
 
@@ -78,6 +86,8 @@
       Constant(name: 'TEST5', rawType: 'int', rawValue: '4'),
       Constant(name: 'TEST6', rawType: 'int', rawValue: '1'),
       Constant(name: 'TEST8', rawType: 'int', rawValue: '5'),
+      Constant(name: 'TEST9', rawType: 'String', rawValue: r"'\$dollar'"),
+      Constant(name: 'TEST10', rawType: 'String', rawValue: r"'test\'s'"),
     ],
   );
 }