pastojs: fixed local record and enum types

git-svn-id: trunk@40133 -

packages/pastojs/src/fppas2js.pp

@@ -6654,10 +6654,13 @@ var
 begin
   if PosEl=nil then PosEl:=El;
   CurName:=TransformVariableName(El,Name,false,AContext);
-  ParentName:=AContext.GetLocalName(El.Parent);
-  if ParentName='' then
-    ParentName:='this';
-  CurName:=ParentName+'.'+CurName;
+  if not (El.Parent is TProcedureBody) then
+    begin
+    ParentName:=AContext.GetLocalName(El.Parent);
+    if ParentName='' then
+      ParentName:='this';
+    CurName:=ParentName+'.'+CurName;
+    end;
   Result:=CreatePrimitiveDotExpr(CurName,PosEl);
 end;
 
@@ -11911,16 +11914,21 @@ begin
     Obj:=TJSObjectLiteral(CreateElement(TJSObjectLiteral,El));
     if AContext is TObjectContext then
       begin
-      // add 'TypeName: function(){}'
+      // add 'TypeName: {}'
       ParentObj:=TObjectContext(AContext).JSElement as TJSObjectLiteral;
       ObjLit:=ParentObj.Elements.AddElement;
       ObjLit.Name:=TJSString(TransformVariableName(El,AContext));
       ObjLit.Expr:=Obj;
       Result:=Obj;
       end
+    else if El.Parent is TProcedureBody then
+      begin
+      // add 'var TypeName = {}'
+      Result:=CreateVarStatement(TransformVariableName(El,AContext),Obj,El);
+      end
     else
       begin
-      // add 'this.TypeName = function(){}'
+      // add 'this.TypeName = {}'
       AssignSt:=TJSSimpleAssignStatement(CreateElement(TJSSimpleAssignStatement,El));
       AssignSt.LHS:=CreateSubDeclNameExpr(El,AContext);
       AssignSt.Expr:=Obj;
@@ -15625,8 +15633,6 @@ function TPasToJSConverter.ConvertIfStatement(El: TPasImplIfElse;
 Var
   C,BThen,BElse : TJSElement;
   T : TJSIfStatement;
-  ok: Boolean;
-
 begin
   Result:=nil;
   if AContext=nil then ;
@@ -17788,6 +17794,7 @@ begin
           Prepend(Result,ParentEl.Name);
         end;
       ParentEl:=ParentEl.Parent;
+      if ParentEl is TProcedureBody then break;
       end;
     end;
 
@@ -18946,7 +18953,6 @@ var
   BodyFirst, BodyLast, ListFirst, ListLast: TJSStatementList;
   FuncContext: TFunctionContext;
   ObjLit: TJSObjectLiteral;
-  ObjEl: TJSObjectLiteralElement;
   IfSt: TJSIfStatement;
   Call, Call2: TJSCallExpression;
   ok: Boolean;
@@ -18958,14 +18964,13 @@ begin
   ok:=false;
   try
     FDS:=CreateFunctionSt(El);
-    if AContext is TObjectContext then
+    FD:=FDS.AFunction;
+    if El.Parent is TProcedureBody then
       begin
-      // add 'TypeName: function(){}'
-      ObjLit:=TObjectContext(AContext).JSElement as TJSObjectLiteral;
-      Result:=ObjLit;
-      ObjEl:=ObjLit.Elements.AddElement;
-      ObjEl.Name:=TJSString(TransformVariableName(El,AContext));
-      ObjEl.Expr:=FDS;
+      // ToDo: elevate to non local scope
+      // add 'function TypeName(){}'
+      Result:=FDS;
+      FD.Name:=TJSString(TransformVariableName(El,AContext));
       end
     else
       begin
@@ -18975,7 +18980,6 @@ begin
       AssignSt.LHS:=CreateSubDeclNameExpr(El,AContext);
       AssignSt.Expr:=FDS;
       end;
-    FD:=FDS.AFunction;
     // add param s
     FD.Params.Add(SrcParamName);
     // create function body

packages/pastojs/tests/tcmodules.pas

@@ -336,6 +336,7 @@ type
     Procedure TestEnumRange_Array;
     Procedure TestEnum_ForIn;
     Procedure TestEnum_ScopedNumber;
+    Procedure TestEnum_InFunction;
     Procedure TestSet_Enum;
     Procedure TestSet_Operators;
     Procedure TestSet_Operator_In;
@@ -432,6 +433,7 @@ type
     Procedure TestRecord_FieldArray;
     Procedure TestRecord_Const;
     Procedure TestRecord_TypecastFail;
+    Procedure TestRecord_InFunction;
 
     // classes
     Procedure TestClass_TObjectDefaultConstructor;
@@ -4277,6 +4279,58 @@ begin
     '$mod.e = 1;']));
 end;
 
+procedure TTestModule.TestEnum_InFunction;
+begin
+  StartProgram(false);
+  Add([
+  'procedure DoIt;',
+  'type',
+  '  TEnum = (Red, Green, Blue);',
+  '  procedure Sub;',
+  '  type',
+  '    TEnumSub = (Left, Right);',
+  '  var',
+  '    es: TEnumSub;',
+  '  begin',
+  '    es:=Left;',
+  '  end;',
+  'var',
+  '  e, e2: TEnum;',
+  'begin',
+  '  if e in [red,blue] then e2:=e;',
+  'end;',
+  'begin']);
+  ConvertProgram;
+  CheckSource('TestEnum_InFunction',
+    LinesToStr([ // statements
+    'this.DoIt = function () {',
+    '  var TEnum = {',
+    '    "0":"Red",',
+    '    Red:0,',
+    '    "1":"Green",',
+    '    Green:1,',
+    '    "2":"Blue",',
+    '    Blue:2',
+    '    };',
+    '  function Sub() {',
+    '    var TEnumSub = {',
+    '      "0": "Left",',
+    '      Left: 0,',
+    '      "1": "Right",',
+    '      Right: 1',
+    '    };',
+    '    var es = 0;',
+    '    es = TEnumSub.Left;',
+    '  };',
+    '  var e = 0;',
+    '  var e2 = 0;',
+    '  if (e in rtl.createSet(TEnum.Red, TEnum.Blue)) e2 = e;',
+    '};',
+    '']),
+    LinesToStr([
+    '']));
+end;
+
 procedure TTestModule.TestSet_Enum;
 begin
   StartProgram(false);
@@ -9206,6 +9260,46 @@ begin
   ConvertProgram;
 end;
 
+procedure TTestModule.TestRecord_InFunction;
+begin
+  StartProgram(false);
+  Add([
+  'procedure DoIt;',
+  'type',
+  '  TPoint = record x,y: longint; end;',
+  '  TPoints = array of TPoint;',
+  'var',
+  '  r: TPoint;',
+  '  p: TPoints;',
+  'begin',
+  '  SetLength(p,2);',
+  'end;',
+  'begin']);
+  ConvertProgram;
+  CheckSource('TestRecord_InFunction',
+    LinesToStr([ // statements
+    'this.DoIt = function () {',
+    '  function TPoint(s) {',
+    '    if (s) {',
+    '      this.x = s.x;',
+    '      this.y = s.y;',
+    '    } else {',
+    '      this.x = 0;',
+    '      this.y = 0;',
+    '    };',
+    '    this.$equal = function (b) {',
+    '      return (this.x === b.x) && (this.y === b.y);',
+    '    };',
+    '  };',
+    '  var r = new TPoint();',
+    '  var p = [];',
+    '  p = rtl.arraySetLength(p, TPoint, 2);',
+    '};',
+    '']),
+    LinesToStr([ // $mod.$main
+    '']));
+end;
+
 procedure TTestModule.TestClass_TObjectDefaultConstructor;
 begin
   StartProgram(false);
@@ -21160,7 +21254,7 @@ begin
   CheckSource('TestRTTI_LocalTypes',
     LinesToStr([ // statements
     'this.DoIt = function () {',
-    '  this.TPoint = function (s) {',
+    '  function TPoint(s) {',
     '    if (s) {',
     '      this.x = s.x;',
     '      this.y = s.y;',