Java: update remaining models, resolve merge conflict

This commit is contained in:
Jami Cogswell
2022-12-15 00:33:06 -05:00
parent 15069250eb
commit 46b8fbc4c9
11 changed files with 215 additions and 183 deletions

View File

@@ -244,6 +244,12 @@ module Public {
* Holds if the summary is auto generated.
*/
predicate isAutoGenerated() { none() }
/**
* Holds if the summary has the given provenance where `true` is
* `generated` and `false` is `manual`.
*/
predicate hasProvenance(boolean generated) { none() } // ! merge with PR #11585
}
/** A callable where there is no flow via the callable. */
@@ -254,6 +260,12 @@ module Public {
* Holds if the neutral is auto generated.
*/
predicate isAutoGenerated() { neutralElement(this, true) }
/**
* Holds if the neutral has the given provenance where `true` is
* `generated` and `false` is `manual`.
*/
predicate hasProvenance(boolean generated) { neutralElement(this, generated) }
}
}
@@ -1012,6 +1024,10 @@ module Private {
}
override predicate isAutoGenerated() { this.relevantSummaryElementGenerated(_, _, _) }
override predicate hasProvenance(boolean generated) {
summaryElement(this, _, _, _, generated)
} // ! merge with PR #11585
}
/** Holds if component `c` of specification `spec` cannot be parsed. */