diff rathaxes_compiler_passes_fix_local_variable_resolution_on_method_call.patch @ 126:6e142648b2fe

Wip on compiler issues
author Louis Opter <louis@lse.epita.fr>
date Sun, 18 Aug 2013 12:51:47 -0700
parents wip_fix_regression_in_rathaxes_compiler_passes_correctly_resolve_chunk_args_subidentifiers.patch@3a92a43a3215
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rathaxes_compiler_passes_fix_local_variable_resolution_on_method_call.patch	Sun Aug 18 12:51:47 2013 -0700
@@ -0,0 +1,31 @@
+# HG changeset patch
+# Parent 1b62d6a6307fbfe6ad9ae7137d189f48b7ceb1fb
+rathaxes: fix resolution of local variables on method call
+
+Fix ${local.skb.init()} crazyness.
+
+diff --git a/rathaxes/compiler/passes/common/rtxResolve.inc.cws b/rathaxes/compiler/passes/common/rtxResolve.inc.cws
+--- a/rathaxes/compiler/passes/common/rtxResolve.inc.cws
++++ b/rathaxes/compiler/passes/common/rtxResolve.inc.cws
+@@ -388,7 +388,20 @@
+                 // Argument comes from the Chunk, so we retrieve the *real* type
+                 // That will be resolved after the "local" resolution.
+ 
+-                rtxResolve_BuildLocalSelf(subResVal, theChunk, placeHolder, subidentifiers);
++                if (subidentifiers#front == "local")
++                    rtxResolve_BuildLocalSelf(subResVal, theChunk, placeHolder, subidentifiers);
++                else
++                {
++                    local src_arg;
++                    local src_type;
++                    local src_value;
++                    rtxNodeArgs_GetArgByName(src_resVals, "self", src_arg);
++                    if (rtxNodeArg_getRType(src_arg, src_type) == false)
++                        return false;
++                    if (rtxNodeArg_getValue(src_arg, src_value) == false)
++                        return false;
++                    rtxNodeArgs_AppendArg(subResVal, "self", src_type, src_value);
++                }
+                 local local_self;
+                 rtxNodeArgs_GetArgByName(subResVal, "self", local_self);
+                 local local_type;