Add '<>:#' as valid characters in symbols

scramjet · Apr 16, 2020 · a188d21 · a188d21
1 parent 8e22d5f
commit a188d21
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/MPEdn/MPEdnParser.m b/MPEdn/MPEdnParser.m
@@ -179,14 +179,22 @@ - (void) addTagReader: (id<MPEdnTaggedValueReader>) reader
 
 #pragma mark - Tokeniser
 
-static BOOL is_sym_punct (unichar ch)
+/// is this a character that may begin a symbol?
+static BOOL isStartSymPunct (unichar ch)
 {
   // NB: '/' is added to the specified EDN set of punctuation allowed in
   // symbol names. The check for its valid use will be done by the parser.
   return (ch >= '!' && ch <= '_' &&
           (ch == '!' || ch == '$' || ch == '%' || ch == '&' || ch == '*' ||
            ch == '+' || ch == '-' || ch == '.' || ch == '=' || ch == '?' ||
-           ch == '_' || ch == '/' || ch == ':' || ch == '#'));
+           ch == '_' || ch == '/' || ch == ':' || ch == '#' || ch == '<' ||
+           ch == '>'));
+}
+
+/// is this a character that may be in a symbol?
+static BOOL isSymPunct (unichar ch)
+{
+  return isStartSymPunct (ch) || ch == ':' || ch == '#';
 }
 
 - (unichar) currentEndIdxChar
@@ -326,7 +334,7 @@ - (void) nextToken
       {
         [self readTagName];
       }
-    } else if (isalpha (ch) || is_sym_punct (ch))
+    } else if (isalpha (ch) || isStartSymPunct (ch))
     {
       [self readNameToken];
     } else
@@ -507,7 +515,7 @@ - (void) readNameToken
   do
   {
     ch = [self advanceEndIdx];
-  } while (isalnum (ch) || is_sym_punct (ch));
+  } while (isalnum (ch) || isSymPunct (ch));
 
   token = TOKEN_NAME;
   tokenValue =
@@ -521,7 +529,7 @@ - (void) readKeywordToken
   do
   {
     ch = [self advanceEndIdx];
-  } while (isalnum (ch) || is_sym_punct (ch));
+  } while (isalnum (ch) || isSymPunct (ch));
 
   NSInteger length = endIdx - startIdx - 1;
 
@@ -627,8 +635,8 @@ - (void) readTagName
   do
   {
     ch = [self advanceEndIdx];
-  } while (isalnum (ch) || is_sym_punct (ch));
-  
+  } while (isalnum (ch) || isStartSymPunct (ch));
+
   NSInteger tagLen = endIdx - startIdx - 1;
 
   if (tagLen > 0)

diff --git a/MPEdnTests/MPEdnParserTests.m b/MPEdnTests/MPEdnParserTests.m
@@ -121,11 +121,13 @@ - (void) testSymbols
 
   MPAssertParseOK (@"+", [MPEdnSymbol symbolWithName: @"+"], @"Symbol");
   MPAssertParseOK (@"-", [MPEdnSymbol symbolWithName: @"-"], @"Symbol");
+  MPAssertParseOK (@"<", [MPEdnSymbol symbolWithName: @"<"], @"Symbol");
+  MPAssertParseOK (@"<:>", [MPEdnSymbol symbolWithName: @"<:>"], @"Symbol");
   MPAssertParseOK (@"+a", [MPEdnSymbol symbolWithName: @"+a"], @"Symbol");
   MPAssertParseOK (@"?", [MPEdnSymbol symbolWithName: @"?"], @"Symbol");
   MPAssertParseOK (@"?a", [MPEdnSymbol symbolWithName: @"?a"], @"Symbol");
   MPAssertParseOK (@"a?", [MPEdnSymbol symbolWithName: @"a?"], @"Symbol");
-  
+
   MPAssertParseError (@"}", @"Not a symbol");
   MPAssertParseError (@"]", @"Not a symbol");
   MPAssertParseError (@")", @"Not a symbol");