Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frama-c
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pub
frama-c
Commits
cae2790d
Commit
cae2790d
authored
4 years ago
by
Andre Maroneze
Browse files
Options
Downloads
Patches
Plain Diff
[Kernel] fix usage of is_relative in JCDB paths
parent
309a1295
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/kernel_services/ast_queries/json_compilation_database.ml
+2
-2
2 additions, 2 deletions
src/kernel_services/ast_queries/json_compilation_database.ml
with
2 additions
and
2 deletions
src/kernel_services/ast_queries/json_compilation_database.ml
+
2
−
2
View file @
cae2790d
...
...
@@ -136,7 +136,7 @@ let parse_entry jcdb_dir r =
let
filename
=
r
|>
member
"file"
|>
to_string
in
let
dirname
=
r
|>
member
"directory"
|>
to_string_option
|>
Extlib
.
opt_conv
jcdb_dir
in
let
dirname
=
if
File
path
.
is_relative
dirname
then
Filename
.
concat
jcdb_dir
dirname
if
File
name
.
is_relative
dirname
then
Filename
.
concat
jcdb_dir
dirname
else
dirname
in
let
dirname
=
Filepath
.
normalize
dirname
in
...
...
@@ -164,7 +164,7 @@ let parse_entry jcdb_dir r =
in
(* conversion for '-I' flags *)
let
convert_path
arg
=
if
File
path
.
is_relative
arg
then
Filename
.
concat
dirname
arg
if
File
name
.
is_relative
arg
then
Filename
.
concat
dirname
arg
else
arg
in
let
convert_define
arg
=
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment