minor code refactoring

src/bdays.jl

@@ -23,8 +23,7 @@ Returns `true` otherwise.
 """
 function isbday(hc::HolidayCalendar, dt::Date) :: Bool
     if _getcachestate(hc)
-        hcc :: HolidayCalendarCache = _getholidaycalendarcache(hc)
-        return isbday(hcc, dt)
+        return isbday(_getholidaycalendarcache(hc), dt)
     else
         return !(isweekend(dt) || isholiday(hc, dt))
     end
@@ -103,8 +102,7 @@ Computation is always based on next Business Day if given dates are not Business
 """
 function bdayscount(hc::HolidayCalendar, dt0::Date, dt1::Date) :: Int
     if _getcachestate(hc)
-        hcc::HolidayCalendarCache = _getholidaycalendarcache(hc)
-        return bdayscount(hcc, dt0, dt1)
+        return bdayscount(_getholidaycalendarcache(hc), dt0, dt1)
     else
         dt0 = tobday(hc, dt0)
         dt1 = tobday(hc, dt1)

src/holidaycalendar.jl

@@ -6,18 +6,15 @@ abstract type HolidayCalendar end
 
 Base.string(hc::HolidayCalendar) = string(typeof(hc))
 
-function symtocalendar(sym::Symbol)
-    local result::HolidayCalendar
+function symtocalendar(sym::Symbol) :: HolidayCalendar
 
     if isdefined(BusinessDays, sym) && eval(BusinessDays, sym) <: HolidayCalendar
-        result = eval(BusinessDays, sym)()
+        return eval(BusinessDays, sym)()
     elseif isdefined(current_module(), sym) && eval(current_module(), sym) <: HolidayCalendar
-        result = eval(current_module(), sym)()
+        return eval(current_module(), sym)()
     else
         error("$sym is not a valid HolidayCalendar.")
     end
-
-    return result
 end
 
 @inline strtocalendar(str::AbstractString) = symtocalendar(Symbol(str))

src/query.jl

@@ -20,19 +20,19 @@ listholidays(calendar, dt0::Date, dt1::Date) = listholidays(convert(HolidayCalen
 Returns the list of business days between `dt0` and `dt1`.
 """
 function listbdays(hc::HolidayCalendar, dt0::Date, dt1::Date)
-    d = tobday(hc,min(dt0,dt1))
+    d = tobday(hc, min(dt0, dt1))
     d1 = max(dt0, dt1)
 
     # empty result
     if d > d1
-        return Array{Date}(0)
+        return Vector{Date}()
     end
 
     n = Dates.value(d1) - Dates.value(d) + 1
-    raw_vec = Array{Date}(n)
+    raw_vec = Vector{Date}(n)
     raw_vec[1] = d
-    i::Int = 2
     d = advancebdays(hc,d,1)
+    i = 2
     while d <= d1
         raw_vec[i] = d
         i += 1