From 3ebd5d49a96b8dffa207826535284b4682789489 Mon Sep 17 00:00:00 2001
From: omicron <omicron@cygnus>
Date: Sun, 12 Nov 2017 08:37:39 -0500
Subject: [PATCH] Update files for eclipse oxygen

---
 .../org.eclipse.wst.common.project.facet.core.xml  |  4 ----
 lisp/finance/biweekly-paydays.lisp                 |  7 +++++++
 lisp/finance/paydays.lisp                          | 14 --------------
 lisp/finance/weekly-paydays.lisp                   |  7 +++++++
 test/function/builtin/special/LETTest.java         |  4 ++--
 test/function/builtin/special/LET_STARTest.java    |  4 ++--
 6 files changed, 18 insertions(+), 22 deletions(-)
 delete mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 lisp/finance/biweekly-paydays.lisp
 delete mode 100644 lisp/finance/paydays.lisp
 create mode 100644 lisp/finance/weekly-paydays.lisp

diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index f4ef8aa..0000000
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="java" version="1.8"/>
-</faceted-project>
diff --git a/lisp/finance/biweekly-paydays.lisp b/lisp/finance/biweekly-paydays.lisp
new file mode 100644
index 0000000..d9aa7f0
--- /dev/null
+++ b/lisp/finance/biweekly-paydays.lisp
@@ -0,0 +1,7 @@
+(let* ((first-payday 5)
+       (leap-year 0)
+       (days-in-year 365)
+       (total-days (+ days-in-year leap-year))
+       (two-weeks 14))
+
+  (+ (/ (- total-days first-payday) two-weeks) 1))
diff --git a/lisp/finance/paydays.lisp b/lisp/finance/paydays.lisp
deleted file mode 100644
index e6e1743..0000000
--- a/lisp/finance/paydays.lisp
+++ /dev/null
@@ -1,14 +0,0 @@
-(let ((first-payday-day 6)
-      (leap-year 0)
-      (days-in-year 365)
-      (two-weeks 14))
-
-  (+
-    (/
-      (-
-        (+
-          days-in-year
-          leap-year)
-        first-payday-day)
-      two-weeks)
-    1))
diff --git a/lisp/finance/weekly-paydays.lisp b/lisp/finance/weekly-paydays.lisp
new file mode 100644
index 0000000..31bbea6
--- /dev/null
+++ b/lisp/finance/weekly-paydays.lisp
@@ -0,0 +1,7 @@
+(let* ((first-payday 5)
+       (leap-year 0)
+       (days-in-year 365)
+       (total-days (+ days-in-year leap-year))
+       (one-week 7))
+
+  (+ (/ (- total-days first-payday) one-week) 1))
diff --git a/test/function/builtin/special/LETTest.java b/test/function/builtin/special/LETTest.java
index 5b34b38..65d7347 100644
--- a/test/function/builtin/special/LETTest.java
+++ b/test/function/builtin/special/LETTest.java
@@ -34,7 +34,7 @@ public class LETTest extends SymbolAndFunctionCleaner {
     }
 
     @Test
-    public void letWithSetf_DoesNotAlterGlobalVariable() {
+    public void letWithSetq_DoesNotAlterGlobalVariable() {
         String before = "(setq x 22)";
         String input = "(let ((x 1)) x)";
         String after = "x";
@@ -45,7 +45,7 @@ public class LETTest extends SymbolAndFunctionCleaner {
     }
 
     @Test
-    public void letWithNestedSetf_DoesNotAlterGlobalVariable() {
+    public void letWithNestedSetq_DoesNotAlterGlobalVariable() {
         String before = "(setq x 22)";
         String input = "(let ((x 33)) (setq x 44) x)";
         String after = "x";
diff --git a/test/function/builtin/special/LET_STARTest.java b/test/function/builtin/special/LET_STARTest.java
index c6d0c33..aeb2f0e 100644
--- a/test/function/builtin/special/LET_STARTest.java
+++ b/test/function/builtin/special/LET_STARTest.java
@@ -34,7 +34,7 @@ public class LET_STARTest extends SymbolAndFunctionCleaner {
     }
 
     @Test
-    public void letStarWithSetf_DoesNotAlterGlobalVariable() {
+    public void letStarWithSetq_DoesNotAlterGlobalVariable() {
         String before = "(setq x 22)";
         String input = "(let* ((x 1)) x)";
         String after = "x";
@@ -45,7 +45,7 @@ public class LET_STARTest extends SymbolAndFunctionCleaner {
     }
 
     @Test
-    public void letStarWithNestedSetf_DoesNotAlterGlobalVariable() {
+    public void letStarWithNestedSetq_DoesNotAlterGlobalVariable() {
         String before = "(setq x 22)";
         String input = "(let* ((x 33)) (setq x 44) x)";
         String after = "x";