Bring dev up to date with master

DESCRIPTION

@@ -4,7 +4,7 @@ Title: Compare R Objects with a Diff
 Description:  Colorized diffs to quickly identify _and understand_ differences
     between R objects.  See `vignette("diffobj")` for details.
 Version: 0.1.1
-Date: 2016-07-27
+Date: 2016-07-29
 Authors@R: c(
     person(
     "Brodie", "Gaslam", email="[email protected]",
@@ -13,7 +13,7 @@ Authors@R: c(
     "Michael B.", "Allen", email="[email protected]",
     role=c("cph"),
     comment="C implementation of Myers Diff Algorithm"))
-License: GPL-3 | MIT + file LICENSE
+License: GPL-3
 LazyData: true
 URL: https://github.com/brodieG/diffobj
 BugReports: https://github.com/brodieG/diffobj/issues

NEWS.md

@@ -1,6 +1,8 @@
 ## diffobj 0.1.1
 
 * Turn off unwrapping for _named_ atomic vectors (see #43)
+* Proper handling of NULL objects in `diffStr` (Issue #44)
+* Fix compilation issues in winbuilder (Issue #41)
 
 ## diffobj 0.1.0
 

R/capt.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 # Capture output of print/show/str; unfortunately doesn't have superb handling
 # of errors during print/show call, though hopefully these are rare
 #

R/check.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 is.less_flags <-
   function(x) is.chr.1L(x) && isTRUE(grepl("^[[:alpha:]]*$", x))
 

R/core.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 #' @include s4.R
 
 NULL

R/diff.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 #' Compare R Objects with a Diff
 #'
 #' Colorized diffs to quickly identify _and understand_ differences between R

R/get.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 # Retrieves data from the data elements of the Diff object based on the index
 # values provided in ind.  Positive values draw from `tar` elements, and
 # negative draw from `cur` elements.

R/guides.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 # Split by guides; used by nested structures to retrieve contents within
 # guides.  Each element has an attribute indicating the indices from the
 # text element it was drawn from

R/html.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 #' @include misc.R
 
 NULL

R/hunks.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 
 # Convert ses data into raw hunks that include both match hunks as well as
 # actual hunks

R/layout.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 # Compute all the different gutter components and report max width
 
 gutter_dat <- function(etc) {

R/misc.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 # Returns the indices of the original rle object that correspond to the
 # ind rle values
 

R/myerssimple.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 # These are deprecated legacy functions from before we incorporated the
 # libmba versions of the myers algo
 

R/pager.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 #' Objects for Specifying Pager Settings
 #'
 #' Generate pager configuration objects to use as the \code{pager} argument to

R/rdiff.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 #' Run Rdiff Directly on R Objects
 #'
 #' These functions are here for reference and testing purposes.  They are

R/rds.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 # Check Whether Input Could Be Reference to RDS File and Load if it Is
 
 get_rds <- function(x) {

R/s4.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 #' @include misc.R
 #' @include styles.R
 #' @include pager.R

R/set.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 #' @include styles.R
 
 NULL

R/styles.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 #' @include html.R
 
 NULL

R/subset.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 #' @include s4.R
 
 NULL

R/summmary.R

@@ -1,3 +1,18 @@
+# diffobj - Compare R Objects with a Diff
+# Copyright (C) 2016  Brodie Gaslam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Go to <https://www.r-project.org/Licenses/GPL-3> for a copy of the license.
+
 #' @include s4.R
 
 NULL