QL: Change more Ruby to QL

Author: hvitved

ql/src/codeql/files/FileSystem.qll

@@ -178,7 +178,7 @@ class File extends Container, @file {
       token = this.getAToken() and
       l = token.getLocation() and
       line in [l.getStartLine() .. l.getEndLine()] and
-      if token instanceof @token_comment then comment = true else comment = false
+      if token instanceof @token_block_comment then comment = true else comment = false
     )
   }
 

tools/autobuild.cmd

@@ -5,6 +5,6 @@ type NUL && "%CODEQL_DIST%\codeql.exe" database index-files ^
     --include-extension=.erb ^
     --size-limit=5m ^
     --language=ruby ^
-    "%CODEQL_EXTRACTOR_RUBY_WIP_DATABASE%"
+    "%CODEQL_EXTRACTOR_QL_WIP_DATABASE%"
 
 exit /b %ERRORLEVEL%

tools/autobuild.sh

@@ -3,9 +3,9 @@
 set -eu
 
 exec "${CODEQL_DIST}/codeql" database index-files \
-    --include-extension=.rb \
-    --include-extension=.erb \
+    --include-extension=.ql \
+    --include-extension=.qll \
     --size-limit=5m \
-    --language=ruby \
+    --language=ql \
     --working-dir=.\
-    "$CODEQL_EXTRACTOR_RUBY_WIP_DATABASE"
+    "$CODEQL_EXTRACTOR_QL_WIP_DATABASE"

tools/index-files.cmd

@@ -1,8 +1,8 @@
 @echo off
 
-type NUL && "%CODEQL_EXTRACTOR_RUBY_ROOT%\tools\win64\extractor.exe" ^
+type NUL && "%CODEQL_EXTRACTOR_QL_ROOT%\tools\win64\extractor.exe" ^
         --file-list "%1" ^
-        --source-archive-dir "%CODEQL_EXTRACTOR_RUBY_SOURCE_ARCHIVE_DIR%" ^
-        --output-dir "%CODEQL_EXTRACTOR_RUBY_TRAP_DIR%"
+        --source-archive-dir "%CODEQL_EXTRACTOR_QL_SOURCE_ARCHIVE_DIR%" ^
+        --output-dir "%CODEQL_EXTRACTOR_QL_TRAP_DIR%"
 
 exit /b %ERRORLEVEL%

tools/index-files.sh

@@ -2,7 +2,7 @@
 
 set -eu
 
-exec "${CODEQL_EXTRACTOR_RUBY_ROOT}/tools/${CODEQL_PLATFORM}/extractor" \
+exec "${CODEQL_EXTRACTOR_QL_ROOT}/tools/${CODEQL_PLATFORM}/extractor" \
         --file-list "$1" \
-        --source-archive-dir "$CODEQL_EXTRACTOR_RUBY_SOURCE_ARCHIVE_DIR" \
-        --output-dir "$CODEQL_EXTRACTOR_RUBY_TRAP_DIR"
+        --source-archive-dir "$CODEQL_EXTRACTOR_QL_SOURCE_ARCHIVE_DIR" \
+        --output-dir "$CODEQL_EXTRACTOR_QL_TRAP_DIR"

tools/qltest.cmd

@@ -6,6 +6,6 @@ type NUL && "%CODEQL_DIST%\codeql.exe" database index-files ^
     --include-extension=.erb ^
     --size-limit=5m ^
     --language=ruby ^
-    "%CODEQL_EXTRACTOR_RUBY_WIP_DATABASE%"
+    "%CODEQL_EXTRACTOR_QL_WIP_DATABASE%"
 
 exit /b %ERRORLEVEL%

tools/qltest.sh

@@ -9,4 +9,4 @@ exec "${CODEQL_DIST}/codeql" database index-files \
     --size-limit=5m \
     --language=ruby \
     --working-dir=.\
-    "$CODEQL_EXTRACTOR_RUBY_WIP_DATABASE"
+    "$CODEQL_EXTRACTOR_QL_WIP_DATABASE"