From 09e59ccf440ab7213f7e2702651c71fef753b6e8 Mon Sep 17 00:00:00 2001 From: Owen Mansel-Chan Date: Wed, 1 May 2024 21:39:38 +0100 Subject: [PATCH 1/3] Name files with empty definitions of MaD extensible predicates to erowdmpty.model.yml --- csharp/ql/lib/ext/{default.model.yml => empty.model.yml} | 0 go/ql/lib/ext/{dummy.model.yml => empty.model.yml} | 0 java/ql/lib/ext/{dummy.model.yml => empty.model.yml} | 0 java/ql/lib/ext/experimental/{dummy.model.yml => empty.model.yml} | 0 .../frameworks/data/internal/{model.yml => empty.model.yml} | 0 .../ruby/frameworks/data/internal/{model.yml => empty.model.yml} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename csharp/ql/lib/ext/{default.model.yml => empty.model.yml} (100%) rename go/ql/lib/ext/{dummy.model.yml => empty.model.yml} (100%) rename java/ql/lib/ext/{dummy.model.yml => empty.model.yml} (100%) rename java/ql/lib/ext/experimental/{dummy.model.yml => empty.model.yml} (100%) rename javascript/ql/lib/semmle/javascript/frameworks/data/internal/{model.yml => empty.model.yml} (100%) rename ruby/ql/lib/codeql/ruby/frameworks/data/internal/{model.yml => empty.model.yml} (100%) diff --git a/csharp/ql/lib/ext/default.model.yml b/csharp/ql/lib/ext/empty.model.yml similarity index 100% rename from csharp/ql/lib/ext/default.model.yml rename to csharp/ql/lib/ext/empty.model.yml diff --git a/go/ql/lib/ext/dummy.model.yml b/go/ql/lib/ext/empty.model.yml similarity index 100% rename from go/ql/lib/ext/dummy.model.yml rename to go/ql/lib/ext/empty.model.yml diff --git a/java/ql/lib/ext/dummy.model.yml b/java/ql/lib/ext/empty.model.yml similarity index 100% rename from java/ql/lib/ext/dummy.model.yml rename to java/ql/lib/ext/empty.model.yml diff --git a/java/ql/lib/ext/experimental/dummy.model.yml b/java/ql/lib/ext/experimental/empty.model.yml similarity index 100% rename from java/ql/lib/ext/experimental/dummy.model.yml rename to java/ql/lib/ext/experimental/empty.model.yml diff --git a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/model.yml b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/empty.model.yml similarity index 100% rename from javascript/ql/lib/semmle/javascript/frameworks/data/internal/model.yml rename to javascript/ql/lib/semmle/javascript/frameworks/data/internal/empty.model.yml diff --git a/ruby/ql/lib/codeql/ruby/frameworks/data/internal/model.yml b/ruby/ql/lib/codeql/ruby/frameworks/data/internal/empty.model.yml similarity index 100% rename from ruby/ql/lib/codeql/ruby/frameworks/data/internal/model.yml rename to ruby/ql/lib/codeql/ruby/frameworks/data/internal/empty.model.yml From 16dcc0969bca2f1f7a7c0906ebe114d5fc942ecc Mon Sep 17 00:00:00 2001 From: Owen Mansel-Chan Date: Wed, 1 May 2024 22:00:01 +0100 Subject: [PATCH 2/3] Standardise comment explaining why extensible predicates must be defined --- csharp/ql/lib/ext/empty.model.yml | 2 ++ go/ql/lib/ext/empty.model.yml | 3 ++- java/ql/lib/ext/empty.model.yml | 5 +++-- java/ql/lib/ext/experimental/empty.model.yml | 4 ++-- .../javascript/frameworks/data/internal/empty.model.yml | 3 ++- .../semmle/python/frameworks/data/internal/empty.model.yml | 3 ++- .../lib/codeql/ruby/frameworks/data/internal/empty.model.yml | 3 ++- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/csharp/ql/lib/ext/empty.model.yml b/csharp/ql/lib/ext/empty.model.yml index a041c1f649b1..f71119f47de5 100644 --- a/csharp/ql/lib/ext/empty.model.yml +++ b/csharp/ql/lib/ext/empty.model.yml @@ -1,4 +1,6 @@ extensions: + # Make sure that the extensible model predicates have at least one definition + # to avoid errors about an undefined extensionals. - addsTo: pack: codeql/csharp-all extensible: sourceModel diff --git a/go/ql/lib/ext/empty.model.yml b/go/ql/lib/ext/empty.model.yml index e04298be8ba4..414145a18c58 100644 --- a/go/ql/lib/ext/empty.model.yml +++ b/go/ql/lib/ext/empty.model.yml @@ -1,5 +1,6 @@ extensions: - # Make sure that the extensible model predicates are at least defined as empty. + # Make sure that the extensible model predicates have at least one definition + # to avoid errors about an undefined extensionals. - addsTo: pack: codeql/go-all extensible: sourceModel diff --git a/java/ql/lib/ext/empty.model.yml b/java/ql/lib/ext/empty.model.yml index 0269fe72311f..f36a853ba26b 100644 --- a/java/ql/lib/ext/empty.model.yml +++ b/java/ql/lib/ext/empty.model.yml @@ -1,5 +1,6 @@ extensions: - # Make sure that the extensible model predicates are at least defined as empty. + # Make sure that the extensible model predicates have at least one definition + # to avoid errors about an undefined extensionals. - addsTo: pack: codeql/java-all extensible: sourceModel @@ -15,4 +16,4 @@ extensions: - addsTo: pack: codeql/java-all extensible: neutralModel - data: [] \ No newline at end of file + data: [] diff --git a/java/ql/lib/ext/experimental/empty.model.yml b/java/ql/lib/ext/experimental/empty.model.yml index b43cb611b663..fc44e61db78e 100644 --- a/java/ql/lib/ext/experimental/empty.model.yml +++ b/java/ql/lib/ext/experimental/empty.model.yml @@ -1,6 +1,6 @@ -# Define the extensible prediactes related to experimental queries -# to at least be empty. extensions: + # Make sure that the extensible model predicates have at least one definition + # to avoid errors about an undefined extensionals. - addsTo: pack: codeql/java-all extensible: experimentalSourceModel diff --git a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/empty.model.yml b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/empty.model.yml index 016192a224ae..f6d1436f92ba 100644 --- a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/empty.model.yml +++ b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/empty.model.yml @@ -1,5 +1,6 @@ extensions: - # Contribute empty data sets to avoid errors about an undefined extensionals + # Make sure that the extensible model predicates have at least one definition + # to avoid errors about an undefined extensionals. - addsTo: pack: codeql/javascript-all extensible: sourceModel diff --git a/python/ql/lib/semmle/python/frameworks/data/internal/empty.model.yml b/python/ql/lib/semmle/python/frameworks/data/internal/empty.model.yml index 49a1f01983f2..4fa217f2e9ca 100644 --- a/python/ql/lib/semmle/python/frameworks/data/internal/empty.model.yml +++ b/python/ql/lib/semmle/python/frameworks/data/internal/empty.model.yml @@ -1,5 +1,6 @@ extensions: - # Contribute empty data sets to avoid errors about an undefined extensionals + # Make sure that the extensible model predicates have at least one definition + # to avoid errors about an undefined extensionals. - addsTo: pack: codeql/python-all extensible: sourceModel diff --git a/ruby/ql/lib/codeql/ruby/frameworks/data/internal/empty.model.yml b/ruby/ql/lib/codeql/ruby/frameworks/data/internal/empty.model.yml index 7dd7c7a9c0cb..185d81333159 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/data/internal/empty.model.yml +++ b/ruby/ql/lib/codeql/ruby/frameworks/data/internal/empty.model.yml @@ -1,5 +1,6 @@ extensions: - # Contribute empty data sets to avoid errors about an undefined extensionals + # Make sure that the extensible model predicates have at least one definition + # to avoid errors about an undefined extensionals. - addsTo: pack: codeql/ruby-all extensible: sourceModel From 83249cd9c2234f6af96fb6bd920af518fd369d15 Mon Sep 17 00:00:00 2001 From: Owen Mansel-Chan Date: Thu, 2 May 2024 09:59:48 +0100 Subject: [PATCH 3/3] Fix grammar in comment --- csharp/ql/lib/ext/empty.model.yml | 2 +- go/ql/lib/ext/empty.model.yml | 2 +- java/ql/lib/ext/empty.model.yml | 2 +- java/ql/lib/ext/experimental/empty.model.yml | 2 +- .../semmle/javascript/frameworks/data/internal/empty.model.yml | 2 +- .../lib/semmle/python/frameworks/data/internal/empty.model.yml | 2 +- .../ql/lib/codeql/ruby/frameworks/data/internal/empty.model.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/csharp/ql/lib/ext/empty.model.yml b/csharp/ql/lib/ext/empty.model.yml index f71119f47de5..6b38b783cbe2 100644 --- a/csharp/ql/lib/ext/empty.model.yml +++ b/csharp/ql/lib/ext/empty.model.yml @@ -1,6 +1,6 @@ extensions: # Make sure that the extensible model predicates have at least one definition - # to avoid errors about an undefined extensionals. + # to avoid errors about undefined extensionals. - addsTo: pack: codeql/csharp-all extensible: sourceModel diff --git a/go/ql/lib/ext/empty.model.yml b/go/ql/lib/ext/empty.model.yml index 414145a18c58..03279fc65880 100644 --- a/go/ql/lib/ext/empty.model.yml +++ b/go/ql/lib/ext/empty.model.yml @@ -1,6 +1,6 @@ extensions: # Make sure that the extensible model predicates have at least one definition - # to avoid errors about an undefined extensionals. + # to avoid errors about undefined extensionals. - addsTo: pack: codeql/go-all extensible: sourceModel diff --git a/java/ql/lib/ext/empty.model.yml b/java/ql/lib/ext/empty.model.yml index f36a853ba26b..43028e7cc14e 100644 --- a/java/ql/lib/ext/empty.model.yml +++ b/java/ql/lib/ext/empty.model.yml @@ -1,6 +1,6 @@ extensions: # Make sure that the extensible model predicates have at least one definition - # to avoid errors about an undefined extensionals. + # to avoid errors about undefined extensionals. - addsTo: pack: codeql/java-all extensible: sourceModel diff --git a/java/ql/lib/ext/experimental/empty.model.yml b/java/ql/lib/ext/experimental/empty.model.yml index fc44e61db78e..b1ee4d24cdfa 100644 --- a/java/ql/lib/ext/experimental/empty.model.yml +++ b/java/ql/lib/ext/experimental/empty.model.yml @@ -1,6 +1,6 @@ extensions: # Make sure that the extensible model predicates have at least one definition - # to avoid errors about an undefined extensionals. + # to avoid errors about undefined extensionals. - addsTo: pack: codeql/java-all extensible: experimentalSourceModel diff --git a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/empty.model.yml b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/empty.model.yml index f6d1436f92ba..12f83f71e55b 100644 --- a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/empty.model.yml +++ b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/empty.model.yml @@ -1,6 +1,6 @@ extensions: # Make sure that the extensible model predicates have at least one definition - # to avoid errors about an undefined extensionals. + # to avoid errors about undefined extensionals. - addsTo: pack: codeql/javascript-all extensible: sourceModel diff --git a/python/ql/lib/semmle/python/frameworks/data/internal/empty.model.yml b/python/ql/lib/semmle/python/frameworks/data/internal/empty.model.yml index 4fa217f2e9ca..ea9b9fce546b 100644 --- a/python/ql/lib/semmle/python/frameworks/data/internal/empty.model.yml +++ b/python/ql/lib/semmle/python/frameworks/data/internal/empty.model.yml @@ -1,6 +1,6 @@ extensions: # Make sure that the extensible model predicates have at least one definition - # to avoid errors about an undefined extensionals. + # to avoid errors about undefined extensionals. - addsTo: pack: codeql/python-all extensible: sourceModel diff --git a/ruby/ql/lib/codeql/ruby/frameworks/data/internal/empty.model.yml b/ruby/ql/lib/codeql/ruby/frameworks/data/internal/empty.model.yml index 185d81333159..b887eed7c1c5 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/data/internal/empty.model.yml +++ b/ruby/ql/lib/codeql/ruby/frameworks/data/internal/empty.model.yml @@ -1,6 +1,6 @@ extensions: # Make sure that the extensible model predicates have at least one definition - # to avoid errors about an undefined extensionals. + # to avoid errors about undefined extensionals. - addsTo: pack: codeql/ruby-all extensible: sourceModel