pastojs: added option -vv, -va includes -vd

git-svn-id: trunk@38965 -

packages/pastojs/src/pas2jscompiler.pp

@@ -92,8 +92,8 @@ type
     coShowTriedUsedFiles,
     coShowConditionals,
     coShowUsedTools,
+    coShowDebug,
     coShowMessageNumbers, // not in "show all"
-    coShowDebug,    // not in "show all"
     // checks
     coOverflowChecks,
     coRangeChecks,
@@ -104,6 +104,7 @@ type
     // output
     coLowerCase,
     coUseStrict,
+    coWriteDebugLog,
     coWriteMsgToStdErr,
     // optimizations
     coEnumValuesAsNumbers,
@@ -118,7 +119,7 @@ type
   TP2jsOptimization = coEnumValuesAsNumbers..coKeepNotUsedDeclarationsWPO;
 const
   DefaultP2jsCompilerOptions = [coShowErrors,coSourceMapXSSIHeader,coUseStrict];
-  coShowAll = [coShowErrors..coShowUsedTools];
+  coShowAll = [coShowErrors..coShowDebug];
   coO1Enable = [coEnumValuesAsNumbers];
   coO1Disable = [coKeepNotUsedPrivates,coKeepNotUsedDeclarationsWPO];
 
@@ -136,8 +137,8 @@ const
     'Show tried/used files',
     'Show conditionals',
     'Show used tools',
-    'Show message numbers',
     'Show debug',
+    'Show message numbers',
     'Overflow checking',
     'Range checking',
     'Method call checking',
@@ -145,6 +146,7 @@ const
     'Allow C assignments',
     'Lowercase identifiers',
     'Use strict',
+    'Write pas2jsdebug.log',
     'Write messages to StdErr',
     'Enum values as numbers',
     'Keep not used private declarations',
@@ -388,6 +390,7 @@ type
     function GetSrcMapEnable: boolean;
     function GetSrcMapInclude: boolean;
     function GetSrcMapXSSIHeader: boolean;
+    function GetWriteDebugLog: boolean;
     function GetWriteMsgToStdErr: boolean;
     function OnMacroCfgDir(Sender: TObject; var Params: string; Lvl: integer
       ): boolean;
@@ -409,6 +412,7 @@ type
     procedure SetSrcMapXSSIHeader(const AValue: boolean);
     procedure SetTargetPlatform(const AValue: TPasToJsPlatform);
     procedure SetTargetProcessor(const AValue: TPasToJsProcessor);
+    procedure SetWriteDebugLog(const AValue: boolean);
     procedure SetWriteMsgToStdErr(const AValue: boolean);
   private
     FInterfaceType: TPasClassInterfaceType;
@@ -514,6 +518,7 @@ type
     property TargetPlatform: TPasToJsPlatform read FTargetPlatform write SetTargetPlatform;
     property TargetProcessor: TPasToJsProcessor read FTargetProcessor write SetTargetProcessor;
     property WPOAnalyzer: TPas2JSWPOptimizer read FWPOAnalyzer; // Whole Program Optimization
+    property WriteDebugLog: boolean read GetWriteDebugLog write SetWriteDebugLog;
     property WriteMsgToStdErr: boolean read GetWriteMsgToStdErr write SetWriteMsgToStdErr;
     property ExitCode: longint read GetExitCode write SetExitCode;
   end;
@@ -1172,10 +1177,10 @@ begin
   try
     Compiler.RemoveReadingModule(Self);
 
-    if ShowDebug then
+    if coWriteDebugLog in Compiler.Options then
     begin
-      Log.LogPlain('Pas-Module:');
+      Log.DebugLogWriteLn('Pas-Module:');
-      Log.LogPlain(PasModule.GetDeclaration(true));
+      Log.DebugLogWriteLn(PasModule.GetDeclaration(true));
     end;
 
     if PCUReader=nil then
@@ -2565,6 +2570,11 @@ begin
   Result:=coSourceMapXSSIHeader in FOptions;
 end;
 
+function TPas2jsCompiler.GetWriteDebugLog: boolean;
+begin
+  Result:=coWriteDebugLog in FOptions;
+end;
+
 function TPas2jsCompiler.GetWriteMsgToStdErr: boolean;
 begin
   Result:=coWriteMsgToStdErr in FOptions;
@@ -2669,6 +2679,11 @@ begin
   AddDefinesForTargetProcessor;
 end;
 
+procedure TPas2jsCompiler.SetWriteDebugLog(const AValue: boolean);
+begin
+  SetOption(coWriteDebugLog,AValue);
+end;
+
 procedure TPas2jsCompiler.SetWriteMsgToStdErr(const AValue: boolean);
 begin
   SetOption(coWriteMsgToStdErr,AValue);
@@ -3517,7 +3532,7 @@ begin
   end;
 
   // read other flags
-  ReadSingleLetterOptions(Param,p,'ewnhila0bctdqxz',Enabled,Disabled);
+  ReadSingleLetterOptions(Param,p,'ewnhila0bctdqxvz',Enabled,Disabled);
   for i:=1 to length(Enabled) do begin
     case Enabled[i] of
     'e': Options:=Options+[coShowErrors];
@@ -3534,6 +3549,7 @@ begin
     'd': ShowDebug:=true;
     'q': Options:=Options+[coShowMessageNumbers];
     'x': Options:=Options+[coShowUsedTools];
+    'v': Options:=Options+[coWriteDebugLog];
     'z': WriteMsgToStdErr:=true;
     end;
   end;
@@ -3553,6 +3569,7 @@ begin
     'd': ShowDebug:=false;
     'q': Options:=Options-[coShowMessageNumbers];
     'x': Options:=Options-[coShowUsedTools];
+    'v': Options:=Options+[coWriteDebugLog];
     'z': WriteMsgToStdErr:=false;
     end;
   end;
@@ -3813,6 +3830,8 @@ begin
   // quick check command line params
   for i:=0 to ParamList.Count-1 do
     ReadParam(ParamList[i],true,true);
+  if WriteDebugLog then
+    Log.OpenDebugLog;
   if ShowLogo then
     WriteLogo;
 
@@ -4010,21 +4029,22 @@ begin
   l('    -Tnodejs  : add pas.run(), includes -Jc');
   l('  -u<x>   : Undefines the symbol <x>');
   l('  -v<x>   : Be verbose. <x> is a combination of the following letters:');
-  l('    e     : show errors (default)');
+  l('    e     : Show errors (default)');
-  l('    w     : show warnings');
+  l('    w     : Show warnings');
-  l('    n     : show notes');
+  l('    n     : Show notes');
-  l('    h     : show hints');
+  l('    h     : Show hints');
-  l('    i     : show info');
+  l('    i     : Show info');
-  l('    l     : show line numbers');
+  l('    l     : Show line numbers');
-  l('    a     : show everything');
+  l('    a     : Show everything');
-  l('    0     : show nothing (except errors)');
+  l('    0     : Show nothing (except errors)');
-  l('    b     : show file names with full path');
+  l('    b     : Show file names with full path');
-  l('    c     : show conditionals');
+  l('    c     : Show conditionals');
-  l('    t     : show tried/used files');
+  l('    t     : Show tried/used files');
-  l('    d     : show debug notes and info, enables -vni');
+  l('    d     : Show debug notes and info, enables -vni');
-  l('    q     : show message numbers');
+  l('    q     : Show message numbers');
-  l('    x     : show used tools');
+  l('    x     : Show used tools');
-  l('    z     : write messages to stderr, -o. still uses stdout.');
+  l('    v     : Write pas2jsdebug.log with lots of debugging info');
+  l('    z     : Write messages to stderr, -o. still uses stdout.');
   l('  -vm<x>,<y>: Do not show messages numbered <x> and <y>.');
   l('  -?      : Show this help');
   l('  -h      : Show this help');
@@ -4055,7 +4075,7 @@ var
   fco: TP2jsFileCacheOption;
 begin
   // message encoding
-  Log.LogMsgIgnoreFilter(nMessageEncodingIs,[IntToStr(Log.MsgCount)]);
+  Log.LogMsgIgnoreFilter(nMessageEncodingIs,[BoolToStr(Log.Encoding<>'',Log.Encoding,'system')]);
   // target platform
   Log.LogMsgIgnoreFilter(nTargetPlatformIs,[PasToJsPlatformNames[TargetPlatform]]);
   Log.LogMsgIgnoreFilter(nTargetProcessorIs,[PasToJsProcessorNames[TargetProcessor]]);

packages/pastojs/src/pas2jslogger.pp

@@ -59,6 +59,7 @@ type
 
   TPas2jsLogger = class
   private
+    FDebugLog: TStream;
     FEncoding: string;
     FLastMsgCol: integer;
     FLastMsgFile: string;
@@ -116,6 +117,9 @@ type
     procedure CloseOutputFile;
     procedure Reset;
     procedure ClearLastMsg;
+    procedure OpenDebugLog;
+    procedure CloseDebugLog;
+    procedure DebugLogWriteLn(Msg: string); overload;
   public
     property Encoding: string read FEncoding write SetEncoding; // normalized
     property MsgCount: integer read GetMsgCount;
@@ -134,6 +138,7 @@ type
     property LastMsgCol: integer read FLastMsgCol write FLastMsgCol;
     property LastMsgTxt: string read FLastMsgTxt write FLastMsgTxt;
     property LastMsgNumber: integer read FLastMsgNumber write FLastMsgNumber;
+    property DebugLog: TStream read FDebugLog write FDebugLog;
   end;
 
 function CompareP2JMessage(Item1, Item2: Pointer): Integer;
@@ -511,35 +516,32 @@ begin
 end;
 
 procedure TPas2jsLogger.DoLogRaw(const Msg: string; SkipEncoding : Boolean);
-
+var
-Var
+  S: String;
-  S : String;
-
 begin
   if SkipEncoding then
     S:=Msg
-  else
+  else begin
-    begin
     if (Encoding='utf8') or (Encoding='json') then
       S:=Msg
     else if Encoding='console' then
       S:=UTF8ToConsole(Msg)
     else if Encoding='system' then
       S:=UTF8ToSystemCP(Msg)
-    else
+    else begin
-      begin
       // default: write UTF-8 to outputfile and console codepage to console
       if FOutputFile=nil then
         S:=UTF8ToConsole(Msg);
-      end;
     end;
+  end;
   //writeln('TPas2jsLogger.LogPlain "',Encoding,'" "',DbgStr(S),'"');
+  if DebugLog<>nil then
+    DebugLogWriteLn(S);
   if FOnLog<>Nil then
     FOnLog(Self,S)
   else if FOutputFile<>nil then
     FOutputFile.Write(S+LineEnding)
-  else
+  else begin
-    begin
     // prevent codepage conversion magic
     SetCodePage(RawByteString(S), CP_OEMCP, False);
     {AllowWriteln}
@@ -548,7 +550,7 @@ begin
     else
       writeln(S);
     {AllowWriteln-}
-    end;
+  end;
 end;
 
 function TPas2jsLogger.Concatenate(Args: array of const): string;
@@ -597,6 +599,7 @@ var
   i: Integer;
 begin
   CloseOutputFile;
+  CloseDebugLog;
   for i:=0 to FMsg.Count-1 do
     TObject(FMsg[i]).Free;
   FreeAndNil(FMsg);
@@ -695,6 +698,13 @@ begin
   LogRaw('');
 end;
 
+procedure TPas2jsLogger.DebugLogWriteLn(Msg: string);
+begin
+  if FDebugLog=nil then exit;
+  Msg:=Msg+LineEnding;
+  FDebugLog.Write(Msg[1],length(Msg));
+end;
+
 procedure TPas2jsLogger.LogPlain(const Msg: string);
 var
   s: String;
@@ -867,5 +877,17 @@ begin
   FLastMsgCol:=0;
 end;
 
+procedure TPas2jsLogger.OpenDebugLog;
+const
+  DbgLogFilename = 'pas2jsdebug.log';
+begin
+  FDebugLog:=TFileStream.Create(DbgLogFilename,fmCreate or fmShareDenyNone);
+end;
+
+procedure TPas2jsLogger.CloseDebugLog;
+begin
+  FreeAndNil(FDebugLog);
+end;
+
 end.
 

utils/pas2js/docs/translation.html

@@ -194,21 +194,22 @@ Put + after a boolean switch option to enable it, - to disable it
     -Tnodejs  : add pas.run(), includes -Jc
   -u<x>   : Undefines the symbol <x>
   -v<x>   : Be verbose. <x> is a combination of the following letters:
-    e     : show errors (default)
+    e     : Show errors (default)
-    w     : show warnings
+    w     : Show warnings
-    n     : show notes
+    n     : Show notes
-    h     : show hints
+    h     : Show hints
-    i     : show info
+    i     : Show info
-    l     : show line numbers
+    l     : Show line numbers
-    a     : show everything
+    a     : Show everything
-    0     : show nothing (except errors)
+    0     : Show nothing (except errors)
-    b     : show file names with full path
+    b     : Show file names with full path
-    c     : show conditionals
+    c     : Show conditionals
-    t     : show tried/used files
+    t     : Show tried/used files
-    d     : show debug notes and info, enables -vni
+    d     : Show debug notes and info, enables -vni
-    q     : show message numbers
+    q     : Show message numbers
-    x     : show used tools
+    x     : Show used tools
-    z     : write messages to stderr, -o. still uses stdout.
+    v     : Write pas2jsdebug.log with lots of debugging info
+    z     : Write messages to stderr, -o. still uses stdout.
   -vm<x>,<y>: Do not show messages numbered <x> and <y>.
   -?      : Show this help
   -h      : Show this help