Merge pull request #7155 from aibaars/ruby-qualified-import

Ruby: QL generator: use qualified imports

Author: aibaars

ruby/generator/src/main.rs

@@ -611,10 +611,10 @@ fn main() -> std::io::Result<()> {
     )?;
     ql::write(
         &mut ql_writer,
-        &[
-            ql::TopLevel::Import("codeql.files.FileSystem"),
-            ql::TopLevel::Import("codeql.Locations"),
-        ],
+        &[ql::TopLevel::Import(ql::Import {
+            module: "codeql.Locations",
+            alias: Some("L"),
+        })],
     )?;
 
     for language in languages {

ruby/generator/src/ql.rs

@@ -4,20 +4,35 @@ use std::fmt;
 #[derive(Clone, Eq, PartialEq, Hash)]
 pub enum TopLevel<'a> {
     Class(Class<'a>),
-    Import(&'a str),
+    Import(Import<'a>),
     Module(Module<'a>),
 }
 
 impl<'a> fmt::Display for TopLevel<'a> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            TopLevel::Import(x) => write!(f, "private import {}", x),
+            TopLevel::Import(imp) => write!(f, "{}", imp),
             TopLevel::Class(cls) => write!(f, "{}", cls),
             TopLevel::Module(m) => write!(f, "{}", m),
         }
     }
 }
 
+#[derive(Clone, Eq, PartialEq, Hash)]
+pub struct Import<'a> {
+    pub module: &'a str,
+    pub alias: Option<&'a str>,
+}
+
+impl<'a> fmt::Display for Import<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "import {}", &self.module)?;
+        if let Some(name) = &self.alias {
+            write!(f, " as {}", name)?;
+        }
+        Ok(())
+    }
+}
 #[derive(Clone, Eq, PartialEq, Hash)]
 pub struct Class<'a> {
     pub qldoc: Option<String>,

ruby/generator/src/ql_gen.rs

@@ -26,7 +26,7 @@ pub fn create_ast_node_class<'a>(ast_node: &'a str, ast_node_parent: &'a str) ->
         Some(String::from("Gets the location of this element.")),
         "getLocation",
         false,
-        Some(ql::Type::Normal("Location")),
+        Some(ql::Type::Normal("L::Location")),
     );
     let get_a_field_or_child = create_none_predicate(
         Some(String::from("Gets a field or child node of this node.")),
@@ -136,7 +136,7 @@ pub fn create_token_class<'a>(token_type: &'a str, tokeninfo: &'a str) -> ql::Cl
         qldoc: Some(String::from("Gets the location of this token.")),
         name: "getLocation",
         overridden: true,
-        return_type: Some(ql::Type::Normal("Location")),
+        return_type: Some(ql::Type::Normal("L::Location")),
         formal_parameters: vec![],
         body: create_get_field_expr_for_column_storage("result", tokeninfo, 2, tokeninfo_arity),
     };
@@ -236,7 +236,7 @@ fn create_get_location_predicate(def_table: &str, arity: usize) -> ql::Predicate
         qldoc: Some(String::from("Gets the location of this element.")),
         name: "getLocation",
         overridden: true,
-        return_type: Some(ql::Type::Normal("Location")),
+        return_type: Some(ql::Type::Normal("L::Location")),
         formal_parameters: vec![],
         // body of the form: foo_bar_def(_, _, ..., result)
         body: ql::Expression::Pred(