~ ncgutil: generate interface thunks for local classes too

~ nld: during the first pass, we rewrite the nodes that load captured variables, except for nodes marked with the new flag loadnf_captured_param
= pdecobj, symdef: factored out tobjectdef.register_implemented_interface
+ pexpr: access to captured variables from expressions; nameless routine declarations
+ symconst: new flags for tprocoption (po_nameless, po_has_closure) and tobjectoption (oo_is_nameless)
~ symdef: mangled name generator is now aware of local classes and interfaces
+ symsym: new field tabstractnormalvarsym.captured_into holds a reference to a new location for the captured variable

git-svn-id: http://svn.freepascal.org/svn/fpc/branches/blaise@20138 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 9 insertions, 0 deletions

diff --git a/closures/compiler/symsym.pas b/closures/compiler/symsym.pas
index c91d3e5d80..653867552e 100644
--- a/closures/compiler/symsym.pas
+++ b/closures/compiler/symsym.pas
@@ -180,11 +180,14 @@ interface
           defaultconstsymderef : tderef;
           localloc      : TLocation; { register/reference for local var }
           initialloc    : TLocation; { initial location so it can still be initialized later after the location was changed by SSA }
+          // if var is captured by a closure, this refers to a field of the class TCapturer
+          captured_into: tfieldvarsym;
           constructor create(st:tsymtyp;const n : string;vsp:tvarspez;def:tdef;vopts:tvaroptions);
           constructor ppuload(st:tsymtyp;ppufile:tcompilerppufile);
           procedure ppuwrite(ppufile:tcompilerppufile);override;
           procedure buildderef;override;
           procedure deref;override;
+          function is_captured: boolean; inline;
       end;
 
       tlocalvarsym = class(tabstractnormalvarsym)
@@ -1397,6 +1400,12 @@ implementation
       end;
 
 
+    function tabstractnormalvarsym.is_captured: boolean; inline;
+      begin
+        result:=assigned(captured_into)
+      end;
+
+
 {****************************************************************************
                              Tstaticvarsym
 ****************************************************************************}