version 2.5.4

cran · Dec 1, 2023 · bd66eae · bd66eae
1 parent 2fc6432
commit bd66eae
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 42 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,12 +1,12 @@
 Package: haven
 Title: Import and Export 'SPSS', 'Stata' and 'SAS' Files
-Version: 2.5.3
+Version: 2.5.4
 Authors@R: c(
     person("Hadley", "Wickham", , "hadley@posit.co", role = c("aut", "cre")),
     person("Evan", "Miller", role = c("aut", "cph"),
            comment = "Author of included ReadStat code"),
     person("Danny", "Smith", role = "aut"),
-    person("RStudio", role = c("cph", "fnd"))
+    person("Posit Software, PBC", role = c("cph", "fnd"))
   )
 Description: Import foreign statistical formats into R via the embedded
     'ReadStat' C library, <https://github.com/WizardMac/ReadStat>.
@@ -28,11 +28,11 @@ Encoding: UTF-8
 RoxygenNote: 7.2.3
 SystemRequirements: GNU make, zlib: zlib1g-dev (deb), zlib-devel (rpm)
 NeedsCompilation: yes
-Packaged: 2023-06-29 21:30:23 UTC; hadleywickham
+Packaged: 2023-11-30 13:28:43 UTC; hadleywickham
 Author: Hadley Wickham [aut, cre],
   Evan Miller [aut, cph] (Author of included ReadStat code),
   Danny Smith [aut],
-  RStudio [cph, fnd]
+  Posit Software, PBC [cph, fnd]
 Maintainer: Hadley Wickham <hadley@posit.co>
 Repository: CRAN
-Date/Publication: 2023-06-30 20:00:02 UTC
+Date/Publication: 2023-11-30 15:10:02 UTC
diff --git a/LICENSE b/LICENSE
@@ -1,2 +1,2 @@
-YEAR: 2013-2019
-COPYRIGHT HOLDER: Hadley Wickham; RStudio; and Evan Miller
+YEAR: 2023
+COPYRIGHT HOLDER: haven authors
diff --git a/MD5 b/MD5
@@ -1,7 +1,7 @@
-97418066bf7ac40398720a0889d89ea3 *DESCRIPTION
-59057db2fcc7f8f6bb930846cc7ae761 *LICENSE
+c3bc6af72eb420df11095cdd17267bb5 *DESCRIPTION
+38e4dadd759e658ca23295b4e69c8630 *LICENSE
 3069948a2b73339ed41dbfc998f4d4ed *NAMESPACE
-84514f712215a799382f6f60d979a223 *NEWS.md
+7da9b46dfd96c4d24f30c320b542be92 *NEWS.md
 e3412da1ca93eb6285d9644d2a07db8e *R/as_factor.R
 7eed111c08f85088c6225b5782675f13 *R/cpp11.R
 abe999b7fa23ff099f13d84234cb7855 *R/haven-package.R
@@ -22,15 +22,15 @@ ea607e28b5195ab0135ccde63d99dbdf *R/labelled_spss.R
 2e572376deee0b066ce9ed926df35586 *R/zap_widths.R
 7fc3339c794878bdf42aad17d9aa974c *R/zzz.R
 6cd39715085a4008e71c1aee78c8144a *README.md
-3c2bfa722ed3c6fd36525ae4d3809614 *build/vignette.rds
+982702b633f1da68408405a014604ade *build/vignette.rds
 bc7baead3b6080f04dc81efd2fe1ff39 *cleanup
 1518305284b6eb1c6fe933781e75d1fe *configure
 d41d8cd98f00b204e9800998ecf8427e *configure.win
 d8a370e0744296e9fa777a6a7a446431 *inst/doc/datetimes.Rmd
 ae1ee5fe5afb7d277cbfe667dafc27c0 *inst/doc/datetimes.html
-d65caa7be28eceb46483900f58d129db *inst/doc/semantics.R
+41fb9352a7c332ca5b36e18d8b5edc94 *inst/doc/semantics.R
 7597ff3a37dd05812a625a401f75ab60 *inst/doc/semantics.Rmd
-4ebe11b2d4dcf1ca3eca8e1b6ffdc5a5 *inst/doc/semantics.html
+5fcbb931aa891c706696bc50212a3046 *inst/doc/semantics.html
 782776cdad132bd02616ab5e0ddbb1a6 *inst/examples/iris.dta
 6d7292019b3784d97ba2e2ced4ce5bac *inst/examples/iris.sas7bdat
 9eec419726af6bb92009b25c5224e32b *inst/examples/iris.sav
@@ -43,8 +43,8 @@ c3978703d8f40f2679795335715e98f4 *man/figures/lifecycle-experimental.svg
 27b879bf3677ea76e3991d56ab324081 *man/figures/lifecycle-questioning.svg
 53b3f893324260b737b3c46ed2a0e643 *man/figures/lifecycle-stable.svg
 1c1fe7a759b86dc6dbcbe7797ab8246c *man/figures/lifecycle-superseded.svg
-0fa3558f0a322190305e9aa9c560305e *man/figures/logo.png
-b8896dd99002143c76f20e7a18a8b692 *man/haven-package.Rd
+9b6682afa4c73e3df70f7d2b37433ad3 *man/figures/logo.png
+4888bf26a9c1331bd5fe2f904a8a7b3f *man/haven-package.Rd
 77d25548d3a63d81e33b7cab8bc49554 *man/labelled.Rd
 d5a3f8c86262f72ff7705a9cfcc54131 *man/labelled_spss.Rd
 24caa8b914409540e21ab4643fa6b3c5 *man/print_labels.Rd
@@ -61,11 +61,11 @@ cee7653156802db60b699a543005cbd7 *man/zap_formats.Rd
 e9ff556e714b7ad8f979b048dee43786 *man/zap_labels.Rd
 769d5161d295987b7c3bb18c61c24d5c *man/zap_missing.Rd
 1a288019a7882014999286262ecbf19d *man/zap_widths.Rd
-f2bea07d45886e42d7d63463a717eb92 *src/DfReader.cpp
+423329eb16a8ddf757612803e1784d03 *src/DfReader.cpp
 74cb9e923c91a96149844a721d6b2d9d *src/DfWriter.cpp
 b746a25e92862049035b66165241390c *src/Makevars.in
 913ef0ded6947861f7d1c835500c84b9 *src/Makevars.win
-cb7f8b892397337c54b7c822b0bd0506 *src/cpp11.cpp
+7011ee6834d36d50a4c150d7f500a054 *src/cpp11.cpp
 8479a5125b7e2ff4fd0ee78207eb1e79 *src/haven_types.cpp
 e02d7d3096abb42d59ffa98896ea6f30 *src/haven_types.h
 103dff612cd33e793e40e7248ad66baa *src/readstat/CKHashTable.c

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# haven 2.5.4
+
+* Fix for upcoming R-devel change.
+
 # haven 2.5.3
 
 * Fix for upcoming R-devel change.

diff --git a/build/vignette.rds b/build/vignette.rds
diff --git a/inst/doc/semantics.R b/inst/doc/semantics.R
@@ -1,4 +1,4 @@
-## ---- include = FALSE---------------------------------------------------------
+## ----include = FALSE----------------------------------------------------------
 library(haven)
 knitr::opts_chunk$set(
   collapse = TRUE,

diff --git a/inst/doc/semantics.html b/inst/doc/semantics.html
@@ -49,7 +49,7 @@
 </style>
 <style type="text/css" data-origin="pandoc">
 pre > code.sourceCode { white-space: pre; position: relative; }
-pre > code.sourceCode > span { display: inline-block; line-height: 1.25; }
+pre > code.sourceCode > span { line-height: 1.25; }
 pre > code.sourceCode > span:empty { height: 1.2em; }
 .sourceCode { overflow: visible; }
 code.sourceCode > span { color: inherit; text-decoration: inherit; }
@@ -380,7 +380,7 @@ <h3><code>labelled()</code></h3>
 <span id="cb1-4"><a href="#cb1-4" tabindex="-1"></a>)</span>
 <span id="cb1-5"><a href="#cb1-5" tabindex="-1"></a>x1</span>
 <span id="cb1-6"><a href="#cb1-6" tabindex="-1"></a><span class="co">#&gt; &lt;labelled&lt;integer&gt;[5]&gt;</span></span>
-<span id="cb1-7"><a href="#cb1-7" tabindex="-1"></a><span class="co">#&gt; [1] 3 5 1 4 2</span></span>
+<span id="cb1-7"><a href="#cb1-7" tabindex="-1"></a><span class="co">#&gt; [1] 4 2 5 1 3</span></span>
 <span id="cb1-8"><a href="#cb1-8" tabindex="-1"></a><span class="co">#&gt; </span></span>
 <span id="cb1-9"><a href="#cb1-9" tabindex="-1"></a><span class="co">#&gt; Labels:</span></span>
 <span id="cb1-10"><a href="#cb1-10" tabindex="-1"></a><span class="co">#&gt;  value label</span></span>
@@ -404,10 +404,10 @@ <h3><code>labelled()</code></h3>
 datastructure that you can convert into a regular R data frame. You can
 do this by either converting to a factor or stripping the labels:</p>
 <div class="sourceCode" id="cb2"><pre class="sourceCode r"><code class="sourceCode r"><span id="cb2-1"><a href="#cb2-1" tabindex="-1"></a><span class="fu">as_factor</span>(x1)</span>
-<span id="cb2-2"><a href="#cb2-2" tabindex="-1"></a><span class="co">#&gt; [1] 3    Bad  Good 4    2   </span></span>
+<span id="cb2-2"><a href="#cb2-2" tabindex="-1"></a><span class="co">#&gt; [1] 4    2    Bad  Good 3   </span></span>
 <span id="cb2-3"><a href="#cb2-3" tabindex="-1"></a><span class="co">#&gt; Levels: Good 2 3 4 Bad</span></span>
 <span id="cb2-4"><a href="#cb2-4" tabindex="-1"></a><span class="fu">zap_labels</span>(x1)</span>
-<span id="cb2-5"><a href="#cb2-5" tabindex="-1"></a><span class="co">#&gt; [1] 3 5 1 4 2</span></span>
+<span id="cb2-5"><a href="#cb2-5" tabindex="-1"></a><span class="co">#&gt; [1] 4 2 5 1 3</span></span>
 <span id="cb2-6"><a href="#cb2-6" tabindex="-1"></a></span>
 <span id="cb2-7"><a href="#cb2-7" tabindex="-1"></a><span class="fu">as_factor</span>(x2)</span>
 <span id="cb2-8"><a href="#cb2-8" tabindex="-1"></a><span class="co">#&gt; [1] Male   Female Female Female Male  </span></span>
@@ -429,30 +429,30 @@ <h3><code>labelled()</code></h3>
 <span id="cb3-8"><a href="#cb3-8" tabindex="-1"></a><span class="co">#&gt; # A tibble: 5 × 3</span></span>
 <span id="cb3-9"><a href="#cb3-9" tabindex="-1"></a><span class="co">#&gt;   x1        x2             z</span></span>
 <span id="cb3-10"><a href="#cb3-10" tabindex="-1"></a><span class="co">#&gt;   &lt;int+lbl&gt; &lt;chr+lbl&gt;  &lt;int&gt;</span></span>
-<span id="cb3-11"><a href="#cb3-11" tabindex="-1"></a><span class="co">#&gt; 1 3         M [Male]       1</span></span>
-<span id="cb3-12"><a href="#cb3-12" tabindex="-1"></a><span class="co">#&gt; 2 5 [Bad]   F [Female]     2</span></span>
-<span id="cb3-13"><a href="#cb3-13" tabindex="-1"></a><span class="co">#&gt; 3 1 [Good]  F [Female]     3</span></span>
-<span id="cb3-14"><a href="#cb3-14" tabindex="-1"></a><span class="co">#&gt; 4 4         F [Female]     4</span></span>
-<span id="cb3-15"><a href="#cb3-15" tabindex="-1"></a><span class="co">#&gt; 5 2         M [Male]       5</span></span>
+<span id="cb3-11"><a href="#cb3-11" tabindex="-1"></a><span class="co">#&gt; 1 4         M [Male]       1</span></span>
+<span id="cb3-12"><a href="#cb3-12" tabindex="-1"></a><span class="co">#&gt; 2 2         F [Female]     2</span></span>
+<span id="cb3-13"><a href="#cb3-13" tabindex="-1"></a><span class="co">#&gt; 3 5 [Bad]   F [Female]     3</span></span>
+<span id="cb3-14"><a href="#cb3-14" tabindex="-1"></a><span class="co">#&gt; 4 1 [Good]  F [Female]     4</span></span>
+<span id="cb3-15"><a href="#cb3-15" tabindex="-1"></a><span class="co">#&gt; 5 3         M [Male]       5</span></span>
 <span id="cb3-16"><a href="#cb3-16" tabindex="-1"></a></span>
 <span id="cb3-17"><a href="#cb3-17" tabindex="-1"></a><span class="fu">zap_labels</span>(df)</span>
 <span id="cb3-18"><a href="#cb3-18" tabindex="-1"></a><span class="co">#&gt; # A tibble: 5 × 3</span></span>
 <span id="cb3-19"><a href="#cb3-19" tabindex="-1"></a><span class="co">#&gt;      x1 x2        z</span></span>
 <span id="cb3-20"><a href="#cb3-20" tabindex="-1"></a><span class="co">#&gt;   &lt;int&gt; &lt;chr&gt; &lt;int&gt;</span></span>
-<span id="cb3-21"><a href="#cb3-21" tabindex="-1"></a><span class="co">#&gt; 1     3 M         1</span></span>
-<span id="cb3-22"><a href="#cb3-22" tabindex="-1"></a><span class="co">#&gt; 2     5 F         2</span></span>
-<span id="cb3-23"><a href="#cb3-23" tabindex="-1"></a><span class="co">#&gt; 3     1 F         3</span></span>
-<span id="cb3-24"><a href="#cb3-24" tabindex="-1"></a><span class="co">#&gt; 4     4 F         4</span></span>
-<span id="cb3-25"><a href="#cb3-25" tabindex="-1"></a><span class="co">#&gt; 5     2 M         5</span></span>
+<span id="cb3-21"><a href="#cb3-21" tabindex="-1"></a><span class="co">#&gt; 1     4 M         1</span></span>
+<span id="cb3-22"><a href="#cb3-22" tabindex="-1"></a><span class="co">#&gt; 2     2 F         2</span></span>
+<span id="cb3-23"><a href="#cb3-23" tabindex="-1"></a><span class="co">#&gt; 3     5 F         3</span></span>
+<span id="cb3-24"><a href="#cb3-24" tabindex="-1"></a><span class="co">#&gt; 4     1 F         4</span></span>
+<span id="cb3-25"><a href="#cb3-25" tabindex="-1"></a><span class="co">#&gt; 5     3 M         5</span></span>
 <span id="cb3-26"><a href="#cb3-26" tabindex="-1"></a><span class="fu">as_factor</span>(df)</span>
 <span id="cb3-27"><a href="#cb3-27" tabindex="-1"></a><span class="co">#&gt; # A tibble: 5 × 3</span></span>
 <span id="cb3-28"><a href="#cb3-28" tabindex="-1"></a><span class="co">#&gt;   x1    x2         z</span></span>
 <span id="cb3-29"><a href="#cb3-29" tabindex="-1"></a><span class="co">#&gt;   &lt;fct&gt; &lt;fct&gt;  &lt;int&gt;</span></span>
-<span id="cb3-30"><a href="#cb3-30" tabindex="-1"></a><span class="co">#&gt; 1 3     Male       1</span></span>
-<span id="cb3-31"><a href="#cb3-31" tabindex="-1"></a><span class="co">#&gt; 2 Bad   Female     2</span></span>
-<span id="cb3-32"><a href="#cb3-32" tabindex="-1"></a><span class="co">#&gt; 3 Good  Female     3</span></span>
-<span id="cb3-33"><a href="#cb3-33" tabindex="-1"></a><span class="co">#&gt; 4 4     Female     4</span></span>
-<span id="cb3-34"><a href="#cb3-34" tabindex="-1"></a><span class="co">#&gt; 5 2     Male       5</span></span></code></pre></div>
+<span id="cb3-30"><a href="#cb3-30" tabindex="-1"></a><span class="co">#&gt; 1 4     Male       1</span></span>
+<span id="cb3-31"><a href="#cb3-31" tabindex="-1"></a><span class="co">#&gt; 2 2     Female     2</span></span>
+<span id="cb3-32"><a href="#cb3-32" tabindex="-1"></a><span class="co">#&gt; 3 Bad   Female     3</span></span>
+<span id="cb3-33"><a href="#cb3-33" tabindex="-1"></a><span class="co">#&gt; 4 Good  Female     4</span></span>
+<span id="cb3-34"><a href="#cb3-34" tabindex="-1"></a><span class="co">#&gt; 5 3     Male       5</span></span></code></pre></div>
 </div>
 </div>
 <div id="missing-values" class="section level2">

diff --git a/man/figures/logo.png b/man/figures/logo.png
diff --git a/man/haven-package.Rd b/man/haven-package.Rd
diff --git a/src/DfReader.cpp b/src/DfReader.cpp
@@ -400,7 +400,7 @@ class DfReader {
       label_set.add(haven_double_value(value), label_s);
       break;
     default:
-      Rf_warning("Unsupported label type: %s", value.type);
+      Rf_warning("Unsupported label type: %i", value.type);
     }
   }
 

diff --git a/src/cpp11.cpp b/src/cpp11.cpp
@@ -110,9 +110,9 @@ extern "C" SEXP _haven_write_xpt_(SEXP data, SEXP path, SEXP version, SEXP name,
 
 extern "C" {
 /* .Call calls */
-extern SEXP is_tagged_na_(SEXP, SEXP);
-extern SEXP na_tag_(SEXP);
-extern SEXP tagged_na_(SEXP);
+extern SEXP is_tagged_na_(void *, void *);
+extern SEXP na_tag_(void *);
+extern SEXP tagged_na_(void *);
 
 static const R_CallMethodDef CallEntries[] = {
     {"_haven_df_parse_dta_file", (DL_FUNC) &_haven_df_parse_dta_file, 6},