fix: escaped property name

apiaryio · Dec 5, 2016 · 0d6a171 · 0d6a171
1 parent dbdbacb
commit 0d6a171
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/MSONUtility.h b/src/MSONUtility.h
@@ -478,7 +478,7 @@ namespace mson {
             parseTypeDefinition(node, pd, signature.attributes, report, propertyName.variable.typeDefinition);
         }
         else {
-            propertyName.literal = subject;
+            propertyName.literal = snowcrash::StripBackticks(buffer);
         }
     }
 

diff --git a/src/SignatureSectionProcessor.h b/src/SignatureSectionProcessor.h
@@ -219,7 +219,7 @@ namespace scpl {
             snowcrash::TrimString(identifier);
 
             if (!identifier.empty()) {
-                out.identifier = snowcrash::StripBackticks(identifier);
+                out.identifier = identifier;
             }
 
             // If the subject ended with the identifier, strip it from the subject

diff --git a/test/test-Signature.cc b/test/test-Signature.cc
@@ -53,7 +53,7 @@ TEST_CASE("Escaped property signature parsing", "[signature]")
     REQUIRE(blueprint.report.error.code == Error::OK);
     REQUIRE(blueprint.report.warnings.empty());
 
-    REQUIRE(signature.identifier == "*id*(data):3");
+    REQUIRE(signature.identifier == "`*id*(data):3`");
     REQUIRE(signature.value == "42");
     REQUIRE(signature.values.size() == 1);
     REQUIRE(signature.values[0] == "`42`");
@@ -138,7 +138,7 @@ TEST_CASE("Identifier enclosed by backticks", "[signature]")
     REQUIRE(blueprint.report.error.code == Error::OK);
     REQUIRE(blueprint.report.warnings.empty());
 
-    REQUIRE(signature.identifier == "username `is` g``ood");
+    REQUIRE(signature.identifier == "```username `is` g``ood```");
     REQUIRE(signature.value.empty());
     REQUIRE(signature.values.empty());
     REQUIRE(signature.attributes.size() == 1);
@@ -172,7 +172,7 @@ TEST_CASE("Extra space content after identifier enclosure", "[signature]")
     REQUIRE(blueprint.report.error.code == Error::OK);
     REQUIRE(blueprint.report.warnings.empty());
 
-    REQUIRE(signature.identifier == "a");
+    REQUIRE(signature.identifier == "`a`");
     REQUIRE(signature.value == "42");
     REQUIRE(signature.values.size() == 1);
     REQUIRE(signature.values[0] == "42");
-Original file line number
+Diff line change
@@ Expand Up / @@ -478,7 +478,7 @@ namespace mson { @@
                 parseTypeDefinition(node, pd, signature.attributes, report, propertyName.variable.typeDefinition);
             }
             else {
-                propertyName.literal = subject;
+                propertyName.literal = snowcrash::StripBackticks(buffer);
             }
         }
@@ Expand Down @@