Skip to content

Commit

Permalink
vala: Drop "explicit" from ValaSourceFile and use "from_commandline"
Browse files Browse the repository at this point in the history
  • Loading branch information
ricotz committed Nov 3, 2018
1 parent 846c5d7 commit b083af0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion vala/valagirparser.vala
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 0 additions & 5 deletions vala/valasourcefile.vala
Original file line number Diff line number Diff line change
Expand Up @@ -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> (); }
Expand Down
4 changes: 2 additions & 2 deletions vapigen/valavapigen.vala
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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;
}
}
Expand Down

0 comments on commit b083af0

Please sign in to comment.