Merge pull request #2036 from rgrinberg/fix-2033

Allow . in c_names and cxx_names
ocaml · Apr 9, 2019 · d300cde · d300cde
2 parents 94fc4ed + 6652739
commit d300cde
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -41,6 +41,8 @@ unreleased
   `binaries` fields would be ignored, but instead they should be combined.
   (#2029, @rgrinberg)
 
+- Allow "." in `c_names` and `cxx_names` (#2036, fix #2033, @rgrinberg)
+
 1.8.2 (10/03/2019)
 ------------------
 

diff --git a/src/c.ml b/src/c.ml
@@ -17,7 +17,7 @@ module Kind = struct
     | Recognized of string * t
 
   let split_extension fn ~dune_version =
-    match String.lsplit2 fn ~on:'.' with
+    match String.rsplit2 fn ~on:'.' with
     | Some (obj, "c") -> Recognized (obj, C)
     | Some (obj, "cpp") -> Recognized (obj, Cxx)
     | Some (obj, "cxx") ->

diff --git a/test/blackbox-tests/dune.inc b/test/blackbox-tests/dune.inc
@@ -595,6 +595,14 @@
    test-cases/github20
    (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
 
+(alias
+ (name github2033)
+ (deps (package dune) (source_tree test-cases/github2033))
+ (action
+  (chdir
+   test-cases/github2033
+   (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
+
 (alias
  (name github24)
  (deps (package dune) (source_tree test-cases/github24))
@@ -1443,6 +1451,7 @@
   (alias github1856)
   (alias github1946)
   (alias github20)
+  (alias github2033)
   (alias github24)
   (alias github25)
   (alias github534)
@@ -1606,6 +1615,7 @@
   (alias github1856)
   (alias github1946)
   (alias github20)
+  (alias github2033)
   (alias github24)
   (alias github25)
   (alias github534)

diff --git a/test/blackbox-tests/test-cases/github2033/dune b/test/blackbox-tests/test-cases/github2033/dune
@@ -0,0 +1,3 @@
+(library
+ (name hello_world)
+ (c_names file.xx))
diff --git a/test/blackbox-tests/test-cases/github2033/dune-project b/test/blackbox-tests/test-cases/github2033/dune-project
@@ -0,0 +1 @@
+(lang dune 1.8)
diff --git a/test/blackbox-tests/test-cases/github2033/file.xx.c b/test/blackbox-tests/test-cases/github2033/file.xx.c
diff --git a/test/blackbox-tests/test-cases/github2033/run.t b/test/blackbox-tests/test-cases/github2033/run.t
@@ -0,0 +1,2 @@
+. should be allowed in c names
+  $ dune build