浏览代码

* Correct compact writing of source elements

git-svn-id: trunk@27456 -
michael 11 年之前
父节点
当前提交
dd8f4eccf2
共有 1 个文件被更改,包括 7 次插入4 次删除
  1. 7 4
      packages/fcl-js/src/jswriter.pp

+ 7 - 4
packages/fcl-js/src/jswriter.pp

@@ -1047,19 +1047,21 @@ Procedure TJSWriter.WriteSourceElements(El :TJSSourceElements);
 Var
 Var
   I : Integer;
   I : Integer;
   C : Boolean;
   C : Boolean;
+  E : TJSElement;
 
 
 begin
 begin
   C:=(woCompact in Options);
   C:=(woCompact in Options);
   For I:=0 to EL.Statements.Count-1 do
   For I:=0 to EL.Statements.Count-1 do
     begin
     begin
-    WriteJS(EL.Statements[i].Node);
-    if C then
+    E:=EL.Statements.Nodes[i].Node;
+    WriteJS(E);
+    if Not C then
+      WriteLn(';')
+    else
       if I<EL.Statements.Count-1 then
       if I<EL.Statements.Count-1 then
         Write('; ')
         Write('; ')
       else
       else
         Write(';')
         Write(';')
-    else
-      WriteLn(';')
     end;
     end;
 end;
 end;
 
 
@@ -1133,6 +1135,7 @@ begin
     WriteSourceElements(TJSSourceElements(el))
     WriteSourceElements(TJSSourceElements(el))
   else
   else
     Error(SErrUnknownJSClass,[El.ClassName]);
     Error(SErrUnknownJSClass,[El.ClassName]);
+//  Write('/* '+EL.ClassName+' */');
   FSkipBrackets:=False;
   FSkipBrackets:=False;
 end;
 end;