return token instead of string in Builtin.getname

NotFound · Jun 25, 2012 · 2527d53 · 2527d53
1 parent d84049d
commit 2527d53
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/winxedst1.winxed b/winxedst1.winxed
@@ -5169,7 +5169,8 @@ class CallBuiltinExpr : FinalExpr
 
 function gencallbuiltin(var owner, var start, var builtin, var args)
 {
-    string callname = builtin.getname();
+    var name = builtin.getname();
+    string callname = name.getidentifier();
     owner.use_builtin(callname);
     int nargs = args == null ? 0 : args.numargs();
     var rawargs = nargs == 0 ? [] : args.getrawargs();
@@ -9857,15 +9858,19 @@ class RootNamespace : NamespaceBase
 //           Compiler classes
 //*********************************************
 
-class Builtin {
+class Builtin
+{
     var name;
     var variants;
     function Builtin(string name, var variant)
     {
         self.name = new TokenIdentifier("__builtins__", 0, name);
         self.variants = [ variant ];
     }
-    function getname() { return string(self.name); }
+    function getname()
+    {
+        return self.name;
+    }
     function addvariant(var variant)
     {
         push(self.variants, variant);

diff --git a/winxedst2.winxed b/winxedst2.winxed
@@ -6722,7 +6722,8 @@ class CallBuiltinExpr : FinalExpr
 
 function gencallbuiltin(var owner, var start, var builtin, var args)
 {
-    string callname = builtin.getname();
+    var name = builtin.getname();
+    string callname = name.getidentifier();
     owner.use_builtin(callname);
     int nargs = args == null ? 0 : args.numargs();
     var rawargs = nargs == 0 ? [] : args.getrawargs();
@@ -13162,15 +13163,19 @@ class RootNamespace : NamespaceBase
 //           Compiler classes
 //*********************************************
 
-class Builtin {
+class Builtin
+{
     var name;
     var variants;
     function Builtin(string name, var variant)
     {
         self.name = new TokenIdentifier("__builtins__", 0, name);
         self.variants = [ variant ];
     }
-    function getname() { return string(self.name); }
+    function getname()
+    {
+        return self.name;
+    }
     function addvariant(var variant)
     {
         push(self.variants, variant);