Commit b083af08 authored by Rico Tzschichholz's avatar Rico Tzschichholz

vala: Drop "explicit" from ValaSourceFile and use "from_commandline"

parent 846c5d70
......@@ -1917,7 +1917,7 @@ public class Vala.GirParser : CodeVisitor {
if (context.has_package (pkg)) {
// package already provided elsewhere, stop parsing this GIR
// if it was not passed explicitly
if (!this.current_source_file.explicit) {
if (!this.current_source_file.from_commandline) {
return;
}
} else {
......
......@@ -124,11 +124,6 @@ public class Vala.SourceFile {
*/
public bool used { get; set; }
/**
* Whether this source-file was explicitly passed on the commandline.
*/
public bool explicit { get; set; }
private ArrayList<Comment> comments = new ArrayList<Comment> ();
public List<UsingDirective> current_using_directives { get; set; default = new ArrayList<UsingDirective> (); }
......
......@@ -132,7 +132,7 @@ class Vala.VAPIGen {
foreach (string source in sources) {
if (FileUtils.test (source, FileTest.EXISTS)) {
var source_file = new SourceFile (context, SourceFileType.PACKAGE, source);
source_file.explicit = true;
source_file.from_commandline = true;
context.add_source_file (source_file);
} else {
Report.error (null, "%s not found".printf (source));
......@@ -190,7 +190,7 @@ class Vala.VAPIGen {
}
}
}
if (file.explicit && file.package_name != null) {
if (file.from_commandline && file.package_name != null) {
package_names += file.package_name;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment