Fix an issue with scaledlabel and update dependency (#36)

Author: junyuan-chen

Project.toml

@@ -6,11 +6,9 @@ version = "0.3.3"
 [deps]
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
 CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"
-Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
 DataAPI = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
-MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 Missings = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28"
 PooledArrays = "2dfb63ee-cc39-5dd5-95bd-886bf059d720"
 PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
@@ -25,10 +23,8 @@ Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 [compat]
 CSV = "0.8"
 CodecZlib = "0.7"
-Combinatorics = "1"
 DataAPI = "1.6"
 DataFrames = "1"
-MacroTools = "0.5"
 Missings = "0.4, 1"
 PooledArrays = "1.2"
 PrettyTables = "1"

src/DiffinDiffsBase.jl

@@ -3,12 +3,10 @@ module DiffinDiffsBase
 using Base: @propagate_inbounds
 using CSV
 using CodecZlib: GzipDecompressorStream
-using Combinatorics: combinations
 using DataAPI
 using DataAPI: refarray, refpool, invrefpool
 using Dates: Period, TimeType
 using LinearAlgebra: Diagonal
-using MacroTools: @capture, isexpr, postwalk
 using Missings: allowmissing, disallowmissing
 using PooledArrays: _label
 using PrettyTables: pretty_table
@@ -24,7 +22,7 @@ using Tables
 using Tables: AbstractColumns, istable, columnnames, getcolumn
 
 import Base: ==, +, -, *, isless, show, parent, view, diff
-import Base: eltype, firstindex, lastindex, getindex, iterate, length, sym_in
+import Base: eltype, firstindex, lastindex, getindex, iterate, length
 import Missings: allowmissing, disallowmissing
 import StatsBase: coef, vcov, confint, nobs, dof_residual, responsename, coefnames, weights,
     coeftable

src/ScaledArrays.jl

@@ -89,8 +89,7 @@ end
 
 function _scaledlabel!(labels::AbstractArray, invpool::Dict, xs::AbstractArray, start, step)
     z = zero(valtype(invpool))
-    @inbounds for i in eachindex(labels)
-        x = xs[i]
+    @inbounds for (i, x) in zip(eachindex(labels), xs)
         lbl = get(invpool, x, z)
         if lbl !== z
             labels[i] = lbl
@@ -118,7 +117,8 @@ function scaledlabel(xs::AbstractArray, stepsize,
             R = widen(R)
         end
     end
-    labels = similar(xs, R)
+    # Array types with customized indexing could cause problems
+    labels = similar(Array{R}, axes(xs))
     invpool = Dict{T,R}()
     _scaledlabel!(labels, invpool, xs, start, stepsize)
     return labels, pool, invpool

src/did.jl

@@ -156,8 +156,9 @@ macro did(args...)
     noproceed = false
     didargs = ()
     if nargs > 0
-        if isexpr(args[1], :vect, :hcat, :vcat)
-            noproceed = _parse!(options, args[1].args)
+        op = args[1]
+        if op isa Expr && op.head in (:vect, :hcat, :vcat)
+            noproceed = _parse!(options, op.args)
             nargs > 1 && (didargs = args[2:end])
         else
             didargs = args