From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sat, 8 Apr 2023 13:50:53 +0000 (+0200)
Subject: Use already available glib_ns instead of root_symbol.scope.lookup ("GLib")
X-Git-Tag: 0.56.7~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2c58001fa8036d985705e21df7e3b6c17b748b7;p=thirdparty%2Fvala.git

Use already available glib_ns instead of root_symbol.scope.lookup ("GLib")
---

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index b4f817708..00d64d39a 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -529,7 +529,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 			gsequence_iter_type = (Class) glib_ns.scope.lookup ("SequenceIter");
 			gthreadpool_type = (TypeSymbol) glib_ns.scope.lookup ("ThreadPool");
 
-			gerror = (Class) root_symbol.scope.lookup ("GLib").scope.lookup ("Error");
+			gerror = (Class) glib_ns.scope.lookup ("Error");
 			gquark_type = new IntegerType ((Struct) glib_ns.scope.lookup ("Quark"));
 			gvalue_type = (Struct) glib_ns.scope.lookup ("Value");
 			gvariant_type = (Class) glib_ns.scope.lookup ("Variant");
@@ -544,7 +544,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 
 			type_module_type = (TypeSymbol) glib_ns.scope.lookup ("TypeModule");
 
-			regex_type = new ObjectType ((Class) root_symbol.scope.lookup ("GLib").scope.lookup ("Regex"));
+			regex_type = new ObjectType ((Class) glib_ns.scope.lookup ("Regex"));
 
 			if (context.module_init_method != null) {
 				foreach (Parameter parameter in context.module_init_method.get_parameters ()) {
diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala
index 98f8e1cf5..a5076a2fe 100644
--- a/vala/valasemanticanalyzer.vala
+++ b/vala/valasemanticanalyzer.vala
@@ -234,7 +234,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
 			gsequence_type = new ObjectType ((Class) glib_ns.scope.lookup ("Sequence"));
 
 			gerror_type = (Class) glib_ns.scope.lookup ("Error");
-			regex_type = new ObjectType ((Class) root_symbol.scope.lookup ("GLib").scope.lookup ("Regex"));
+			regex_type = new ObjectType ((Class) glib_ns.scope.lookup ("Regex"));
 
 			gsource_type = (Class) glib_ns.scope.lookup ("Source");