hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-02-19 16:33:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #80 from github/aibaars/revert-dup-code

Browse Source 
Updates after CodeQL upgrade to 2.4.1
This commit is contained in:
Nick Rolfe
2020-12-21 09:57:59 +00:00
committed by GitHub
parent ff8ea6d44f d4874641a3
commit b1b2815c26
3 changed files with 2 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
generator/src/main.rs
View File

@@ -275,141 +275,9 @@ fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<dbscheme::Entry<
name: "ast_node_parent",
members: ["ast_node", "file"].iter().cloned().collect(),
}));
// TODO: remove
// Add duplicate code tables
entries.extend(duplicate_code_entries());
entries
}
fn duplicate_code_entries() -> Vec<dbscheme::Entry<'static>> {
vec![
// duplicateCode(
// unique int id: @duplication,
// string relativePath: string ref,
// int equivClass: int ref);
dbscheme::Entry::Table(dbscheme::Table {
name: "duplicateCode",
keysets: None,
columns: vec![
dbscheme::Column {
db_type: dbscheme::DbColumnType::Int,
name: "id",
unique: true,
ql_type: ql::Type::AtType("duplication"),
ql_type_is_ref: false,
},
dbscheme::Column {
db_type: dbscheme::DbColumnType::String,
name: "relativePath",
unique: false,
ql_type: ql::Type::String,
ql_type_is_ref: true,
},
dbscheme::Column {
db_type: dbscheme::DbColumnType::Int,
name: "equivClass",
unique: false,
ql_type: ql::Type::Int,
ql_type_is_ref: true,
},
],
}),
// similarCode(
// unique int id: @similarity,
// string relativePath: string ref,
// int equivClass: int ref);
dbscheme::Entry::Table(dbscheme::Table {
name: "similarCode",
keysets: None,
columns: vec![
dbscheme::Column {
db_type: dbscheme::DbColumnType::Int,
name: "id",
unique: true,
ql_type: ql::Type::AtType("similarity"),
ql_type_is_ref: false,
},
dbscheme::Column {
db_type: dbscheme::DbColumnType::String,
name: "relativePath",
unique: false,
ql_type: ql::Type::String,
ql_type_is_ref: true,
},
dbscheme::Column {
db_type: dbscheme::DbColumnType::Int,
name: "equivClass",
unique: false,
ql_type: ql::Type::Int,
ql_type_is_ref: true,
},
],
}),
// @duplication_or_similarity = @duplication | @similarity
dbscheme::Entry::Union(dbscheme::Union {
name: "duplication_or_similarity",
members: ["duplication", "similarity"].iter().cloned().collect(),
}),
// tokens(
// int id: @duplication_or_similarity ref,
// int offset: int ref,
// int beginLine: int ref,
// int beginColumn: int ref,
// int endLine: int ref,
// int endColumn: int ref);
dbscheme::Entry::Table(dbscheme::Table {
name: "tokens",
keysets: None,
columns: vec![
dbscheme::Column {
db_type: dbscheme::DbColumnType::Int,
name: "id",
unique: false,
ql_type: ql::Type::AtType("duplication_or_similarity"),
ql_type_is_ref: true,
},
dbscheme::Column {
db_type: dbscheme::DbColumnType::Int,
name: "offset",
unique: false,
ql_type: ql::Type::Int,
ql_type_is_ref: true,
},
dbscheme::Column {
db_type: dbscheme::DbColumnType::Int,
name: "beginLine",
unique: false,
ql_type: ql::Type::Int,
ql_type_is_ref: true,
},
dbscheme::Column {
db_type: dbscheme::DbColumnType::Int,
name: "beginColumn",
unique: false,
ql_type: ql::Type::Int,
ql_type_is_ref: true,
},
dbscheme::Column {
db_type: dbscheme::DbColumnType::Int,
name: "endLine",
unique: false,
ql_type: ql::Type::Int,
ql_type_is_ref: true,
},
dbscheme::Column {
db_type: dbscheme::DbColumnType::Int,
name: "endColumn",
unique: false,
ql_type: ql::Type::Int,
ql_type_is_ref: true,
},
],
}),
]
}
fn create_tokeninfo<'a>(
token_kinds: Map<&'a str, usize>,
) -> (dbscheme::Case<'a>, dbscheme::Table<'a>) {

5
ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
View File

@@ -1067,9 +1067,8 @@ module Trees {
// completion from the body
c =
any(NestedEnsureCompletion nec |
this
.lastEnsure(last, nec.getAnInnerCompatibleCompletion(), nec.getOuterCompletion(),
nec.getNestLevel())
this.lastEnsure(last, nec.getAnInnerCompatibleCompletion(), nec.getOuterCompletion(),
nec.getNestLevel())
)
or
not exists(this.getBodyChild(_, _)) and

23
ql/src/ruby.dbscheme
View File

@@ -1483,26 +1483,3 @@ case @token.kind of
@ast_node_parent = @ast_node | @file
duplicateCode(
unique int id: @duplication,
string relativePath: string ref,
int equivClass: int ref
);
similarCode(
unique int id: @similarity,
string relativePath: string ref,
int equivClass: int ref
);
@duplication_or_similarity = @duplication | @similarity
tokens(
int id: @duplication_or_similarity ref,
int offset: int ref,
int beginLine: int ref,
int beginColumn: int ref,
int endLine: int ref,
int endColumn: int ref
);