Browse Source

pastojs: allow $ScopedEnums

git-svn-id: trunk@37816 -
Mattias Gaertner 7 years ago
parent
commit
c88dcf8f83
2 changed files with 12 additions and 0 deletions
  1. 5 0
      packages/pastojs/src/fppas2js.pp
  2. 7 0
      packages/pastojs/tests/tcmodules.pas

+ 5 - 0
packages/pastojs/src/fppas2js.pp

@@ -840,6 +840,11 @@ const
     msIgnoreInterfaces,
     msIgnoreInterfaces,
     msIgnoreAttributes];
     msIgnoreAttributes];
 
 
+  msAllPas2jsBoolSwitches = [
+    bsMacro,
+    bsScopedEnums
+    ];
+
   btAllJSBaseTypes = [
   btAllJSBaseTypes = [
     btChar,
     btChar,
     btWideChar,
     btWideChar,

+ 7 - 0
packages/pastojs/tests/tcmodules.pas

@@ -736,13 +736,20 @@ begin
   FFilename:='test1.pp';
   FFilename:='test1.pp';
   FFileResolver:=TStreamResolver.Create;
   FFileResolver:=TStreamResolver.Create;
   FFileResolver.OwnsStreams:=True;
   FFileResolver.OwnsStreams:=True;
+
   FScanner:=TPascalScanner.Create(FFileResolver);
   FScanner:=TPascalScanner.Create(FFileResolver);
+
   FScanner.AllowedModeSwitches:=msAllPas2jsModeSwitches;
   FScanner.AllowedModeSwitches:=msAllPas2jsModeSwitches;
   FScanner.ReadOnlyModeSwitches:=msAllPas2jsModeSwitchesReadOnly;
   FScanner.ReadOnlyModeSwitches:=msAllPas2jsModeSwitchesReadOnly;
   FScanner.CurrentModeSwitches:=OBJFPCModeSwitches*msAllPas2jsModeSwitches+msAllPas2jsModeSwitchesReadOnly;
   FScanner.CurrentModeSwitches:=OBJFPCModeSwitches*msAllPas2jsModeSwitches+msAllPas2jsModeSwitchesReadOnly;
+
+  FScanner.AllowedBoolSwitches:=msAllPas2jsBoolSwitches;
+
   FEngine:=AddModule(Filename);
   FEngine:=AddModule(Filename);
+
   FParser:=TTestPasParser.Create(FScanner,FFileResolver,FEngine);
   FParser:=TTestPasParser.Create(FScanner,FFileResolver,FEngine);
   Parser.Options:=Parser.Options+po_pas2js+[po_KeepScannerError];
   Parser.Options:=Parser.Options+po_pas2js+[po_KeepScannerError];
+
   FModule:=Nil;
   FModule:=Nil;
   FConverter:=CreateConverter;
   FConverter:=CreateConverter;