aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-01 23:50:19 +0000
committerMelanie Thielker2008-11-01 23:50:19 +0000
commit44852158f23d25ea56bcf24a0f09175e21838802 (patch)
tree864074de8c2191a6688b1930336e678f197a79fb /OpenSim
parent* Apply http://opensimulator.org/mantis/view.php?id=2440 (diff)
downloadopensim-SC_OLD-44852158f23d25ea56bcf24a0f09175e21838802.zip
opensim-SC_OLD-44852158f23d25ea56bcf24a0f09175e21838802.tar.gz
opensim-SC_OLD-44852158f23d25ea56bcf24a0f09175e21838802.tar.bz2
opensim-SC_OLD-44852158f23d25ea56bcf24a0f09175e21838802.tar.xz
Mantis #2518
Thank you, idb, for a patch that fixes the conflicts of lsl identifiers with c# keywords
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs39
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs91
2 files changed, 121 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
index a825eff..5100f23 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
@@ -214,11 +214,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
214 else if (s is Constant) 214 else if (s is Constant)
215 retstr += GenerateConstant((Constant) s); 215 retstr += GenerateConstant((Constant) s);
216 else if (s is IdentDotExpression) 216 else if (s is IdentDotExpression)
217 retstr += Generate(((IdentDotExpression) s).Name + "." + ((IdentDotExpression) s).Member, s); 217 retstr += Generate(CheckName(((IdentDotExpression) s).Name) + "." + ((IdentDotExpression) s).Member, s);
218 else if (s is IdentExpression) 218 else if (s is IdentExpression)
219 retstr += Generate(((IdentExpression) s).Name, s); 219 retstr += Generate(CheckName(((IdentExpression) s).Name), s);
220 else if (s is IDENT) 220 else if (s is IDENT)
221 retstr += Generate(((TOKEN) s).yytext, s); 221 retstr += Generate(CheckName(((TOKEN) s).yytext), s);
222 else 222 else
223 { 223 {
224 foreach (SYMBOL kid in s.kids) 224 foreach (SYMBOL kid in s.kids)
@@ -247,7 +247,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
247 else 247 else
248 remainingKids.Add(kid); 248 remainingKids.Add(kid);
249 249
250 retstr += GenerateIndented(String.Format("{0} {1}(", gf.ReturnType, gf.Name), gf); 250 retstr += GenerateIndented(String.Format("{0} {1}(", gf.ReturnType, CheckName(gf.Name)), gf);
251 251
252 // print the state arguments, if any 252 // print the state arguments, if any
253 foreach (SYMBOL kid in argumentDeclarationListKids) 253 foreach (SYMBOL kid in argumentDeclarationListKids)
@@ -344,7 +344,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
344 344
345 foreach (Declaration d in adl.kids) 345 foreach (Declaration d in adl.kids)
346 { 346 {
347 retstr += Generate(String.Format("{0} {1}", d.Datatype, d.Id), d); 347 retstr += Generate(String.Format("{0} {1}", d.Datatype, CheckName(d.Id)), d);
348 if (0 < comma--) 348 if (0 < comma--)
349 retstr += Generate(", "); 349 retstr += Generate(", ");
350 } 350 }
@@ -403,7 +403,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
403 /// <returns>String containing C# code for Declaration d.</returns> 403 /// <returns>String containing C# code for Declaration d.</returns>
404 private string GenerateDeclaration(Declaration d) 404 private string GenerateDeclaration(Declaration d)
405 { 405 {
406 return Generate(String.Format("{0} {1}", d.Datatype, d.Id), d); 406 return Generate(String.Format("{0} {1}", d.Datatype, CheckName(d.Id)), d);
407 } 407 }
408 408
409 /// <summary> 409 /// <summary>
@@ -694,10 +694,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
694 if (0 < ide.kids.Count) 694 if (0 < ide.kids.Count)
695 { 695 {
696 IdentDotExpression dot = (IdentDotExpression) ide.kids.Top; 696 IdentDotExpression dot = (IdentDotExpression) ide.kids.Top;
697 retstr += Generate(String.Format("{0}", ide.PostOperation ? dot.Name + "." + dot.Member + ide.Operation : ide.Operation + dot.Name + "." + dot.Member), ide); 697 retstr += Generate(String.Format("{0}", ide.PostOperation ? CheckName(dot.Name) + "." + dot.Member + ide.Operation : ide.Operation + CheckName(dot.Name) + "." + dot.Member), ide);
698 } 698 }
699 else 699 else
700 retstr += Generate(String.Format("{0}", ide.PostOperation ? ide.Name + ide.Operation : ide.Operation + ide.Name), ide); 700 retstr += Generate(String.Format("{0}", ide.PostOperation ? CheckName(ide.Name) + ide.Operation : ide.Operation + CheckName(ide.Name)), ide);
701 701
702 return retstr; 702 return retstr;
703 } 703 }
@@ -728,7 +728,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
728 { 728 {
729 string retstr = String.Empty; 729 string retstr = String.Empty;
730 730
731 retstr += Generate(String.Format("{0}(", fc.Id), fc); 731 retstr += Generate(String.Format("{0}(", CheckName(fc.Id)), fc);
732 732
733 foreach (SYMBOL kid in fc.kids) 733 foreach (SYMBOL kid in fc.kids)
734 retstr += GenerateNode(kid); 734 retstr += GenerateNode(kid);
@@ -968,5 +968,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
968 968
969 return retstr; 969 return retstr;
970 } 970 }
971
972 /// <summary>
973 /// Returns the passed name with an underscore prepended if that name is a reserved word in C#
974 /// and not resevered in LSL otherwise it just returns the passed name.
975 ///
976 /// This makes no attempt to cache the results to minimise future lookups. For a non trivial
977 /// scripts the number of unique identifiers could easily grow to the size of the reserved word
978 /// list so maintaining a list or dictionary and doing the lookup there firstwould probably not
979 /// give any real speed advantage.
980 ///
981 /// I believe there is a class Microsoft.CSharp.CSharpCodeProvider that has a function
982 /// CreateValidIdentifier(str) that will return either the value of str if it is not a C#
983 /// key word or "_"+str if it is. But availability under Mono?
984 /// </summary>
985 private string CheckName(string s)
986 {
987 if (CSReservedWords.IsReservedWord(s))
988 return "_" + s;
989 else
990 return s;
991 }
971 } 992 }
972} 993}
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs
new file mode 100644
index 0000000..bd758d6
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs
@@ -0,0 +1,91 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
29using System;
30using System.Collections.Generic;
31
32namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
33{
34 /// <summary>
35 /// A container for all of the reserved C# words that are not also reserved words in LSL.
36 /// The words must be maintained in alphabetical order.
37 /// The words that are key words in lsl are picked up by the lsl compiler as errors.
38 /// The LSL reserved words have been left in the list as comments for completeness
39 /// </summary>
40 internal class CSReservedWords
41 {
42 private static List<string> reservedWords = new List<string>(new string[] {
43 "abstract","as",
44 "base","bool","break","byte",
45 "case","catch","char","checked","class","const","continue",
46 "decimal","default","delegate",
47 //"do",
48 "double",
49 //"else",
50 "enum",
51 //"event",
52 "explicit","extern",
53 "false","finally","fixed",
54 //"float","for",
55 "foreach",
56 "goto",
57 //"if",
58 "implicit","in","int","interface","internal","is",
59 "lock","long",
60 "namespace","new","null",
61 "object","operator","out","override",
62 "params","private","protected","public",
63 "readonly","ref",
64 //"return",
65 "sbyte","sealed","short","sizeof","stackalloc","static",
66 //"string",
67 "struct","switch",
68 "this","throw","true","try","typeof",
69 "uint","ulong","unchecked","unsafe","ushort","using",
70 "virtual","void","volatile",
71 //"while"
72 });
73
74 /// <summary>
75 /// Returns true if the passed string is in the list of reserved words with
76 /// a little simple pre-filtering.
77 /// </summary>
78 internal static bool IsReservedWord(string word)
79 {
80 // A couple of quick filters to weed out single characters, ll functions and
81 // anything that starts with an uppercase letter
82 if (String.IsNullOrEmpty(word)) return false;
83 if (word.Length < 2) return false;
84 if (word.StartsWith("ll")) return false;
85 char first = word.ToCharArray(0,1)[0];
86 if (first >= 'A' && first <= 'Z') return false;
87
88 return (reservedWords.BinarySearch(word) >= 0);
89 }
90 }
91}