Added #Delimiter.

Reported by derRaphael on IRC.
Paris · Oct 31, 2010 · 310576b · 310576b
1 parent d7d367f
commit 310576b
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 10 deletions.
diff --git a/Scripting/Generator/Emission/Expression.cs b/Scripting/Generator/Emission/Expression.cs
@@ -128,7 +128,7 @@ void EmitInvoke(CodeMethodInvokeExpression invoke)
                             first = false;
                         else
                         {
-                            writer.Write(Parser.Multicast);
+                            writer.Write(Parser.DefaultMulticast);
                             writer.Write(Parser.SingleSpace);
                         }
 
@@ -165,7 +165,7 @@ void EmitInvoke(CodeMethodInvokeExpression invoke)
                 depth++;
                 if (i > 0)
                 {
-                    writer.Write(Parser.Multicast);
+                    writer.Write(Parser.DefaultMulticast);
                     writer.Write(Parser.SingleSpace);
                 }
                 EmitExpression(invoke.Parameters[i]);
@@ -272,7 +272,7 @@ void EmitArray(CodeArrayCreateExpression array)
                     first = false;
                 else
                 {
-                    writer.Write(Parser.Multicast);
+                    writer.Write(Parser.DefaultMulticast);
                     writer.Write(Parser.SingleSpace);
                 }
                 EmitExpression(expr);

diff --git a/Scripting/Generator/Emission/Members.cs b/Scripting/Generator/Emission/Members.cs
@@ -36,7 +36,7 @@ void EmitMethod(CodeMemberMethod method)
                 if (first)
                     first = false;
                 else
-                    writer.Write(Parser.Multicast);
+                    writer.Write(Parser.DefaultMulticast);
 
             }
 

diff --git a/Scripting/Parser/Construct/Directive.cs b/Scripting/Parser/Construct/Directive.cs
@@ -141,6 +141,10 @@ void ParseDirective(string code)
                     Escape = parts[1][0];
                     break;
 
+                case "DELIMITER":
+                    Multicast = parts[1][0];
+                    break;
+
                 case "HOTSTRING":
                     HotstringNewOptions = parts[1];
                     break;

diff --git a/Scripting/Parser/Construct/Expressions/Texts.cs b/Scripting/Parser/Construct/Expressions/Texts.cs
@@ -189,7 +189,6 @@ List<object> SplitTokens(string code)
                                 case Less:
                                 case BitXOR:
                                 case BitOR:
-                                case Multicast:
                                 case ParenOpen:
                                 case ParenClose:
                                 case Equal:
@@ -235,7 +234,7 @@ List<object> SplitTokens(string code)
                                     break;
 
                                 default:
-                                    if (sym == Resolve)
+                                    if (sym == Resolve || sym == Multicast)
                                         goto case Add;
                                     throw new ParseException(ExUnexpected);
                             }

diff --git a/Scripting/Parser/Symbols.cs b/Scripting/Parser/Symbols.cs
@@ -31,7 +31,6 @@ partial class Parser
         internal const char TernaryB = ':';
         internal const char HotkeyBound = ':';
         internal const string HotkeySignal = "::";
-        internal const char Multicast = ',';
         internal const char Directive = '#';
 
 #if !LEGACY
@@ -41,6 +40,7 @@ partial class Parser
         internal const char DefaultEscpe = '`';
         internal const char DefaultComment = ';';
         internal const char DefaultResolve = '%';
+        internal const char DefaultMulticast = ',';
 
 #if !LEGACY
         const
@@ -57,6 +57,11 @@ partial class Parser
 #endif
         internal char Resolve = DefaultResolve;
 
+#if !LEGACY
+        const
+#endif
+        internal char Multicast = DefaultMulticast;
+
 #if LEGACY
         internal const string VarExt = "#_@$?"; // []
 #endif

diff --git a/Scripting/Parser/Texts/Line.cs b/Scripting/Parser/Texts/Line.cs
@@ -38,7 +38,6 @@ bool IsContinuationLine(string code)
                 case Concatenate:
                 case Equal:
                 case TernaryA:
-                case Multicast:
                 case Not:
                 case BitNOT:
                 case BitXOR:
@@ -62,6 +61,11 @@ bool IsContinuationLine(string code)
                     if (code.Length > 1 && code[1] == Equal)
                         return true;
                     return !(code.Length > 1 && !IsSpace(code[1]));
+
+                default:
+                    if (code[0] == Multicast)
+                        goto case Divide;
+                    break;
             }
 
             if (code.Length >= AndTxt.Length && code.Substring(0, AndTxt.Length).Equals(AndTxt, StringComparison.OrdinalIgnoreCase))

diff --git a/Scripting/Script/Conversion.cs b/Scripting/Script/Conversion.cs
@@ -148,7 +148,7 @@ public static string ForceString(object input)
                     if (first)
                         first = false;
                     else
-                        buffer.Append(Parser.Multicast);
+                        buffer.Append(Parser.DefaultMulticast);
 
                     buffer.Append(Parser.StringBound);
                     buffer.Append(ForceString(key));
@@ -187,7 +187,7 @@ public static string ForceString(object input)
                     if (first)
                         first = false;
                     else
-                        buffer.Append(Parser.Multicast);
+                        buffer.Append(Parser.DefaultMulticast);
 
                     buffer.Append(ForceString(item));
                 }