Merge pull request #209 from africanmathsinitiative/master

Updating Master
Patowhiz · Nov 5, 2018 · 87b97ed · 87b97ed
2 parents 3326807 + eead410
commit 87b97ed
Show file tree

Hide file tree

Showing 9 changed files with 1,502 additions and 841 deletions.
diff --git a/instat/clsRSyntax.vb b/instat/clsRSyntax.vb
@@ -467,9 +467,9 @@ Public Class RSyntax
     Public Sub ClearCodes()
         lstBeforeCodes = New List(Of RCodeStructure)
         lstAfterCodes = New List(Of RCodeStructure)
-        clsBaseFunction = Nothing
-        clsBaseOperator = Nothing
-        clsBaseCommandString = Nothing
+        clsBaseFunction = New RFunction
+        clsBaseOperator = New ROperator
+        clsBaseCommandString = New RCodeStructure
         strCommandString = ""
         bUseBaseFunction = False
         bUseBaseOperator = False

diff --git a/instat/dlgMakeDate.vb b/instat/dlgMakeDate.vb
@@ -546,7 +546,7 @@ Public Class dlgMakeDate
         End If
     End Sub
 
-    Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDayTwo.ControlContentsChanged, ucrSaveDate.ControlContentsChanged, ucrReceiverYearTwo.ControlContentsChanged, ucrReceiverForDate.ControlContentsChanged, ucrReceiverYearThree.ControlContentsChanged, ucrReceiverMonthThree.ControlContentsChanged, ucrReceiverDayThree.ControlContentsChanged, ucrInputDayThree.ControlContentsChanged, ucrInputMonthThree.ControlContentsChanged, ucrInputYearThree.ControlContentsChanged, ucrPnlYearType.ControlContentsChanged, ucrPnlMonthType.ControlContentsChanged, ucrPnlDayType.ControlContentsChanged
+    Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDayTwo.ControlContentsChanged, ucrSaveDate.ControlContentsChanged, ucrReceiverYearTwo.ControlContentsChanged, ucrReceiverForDate.ControlContentsChanged, ucrReceiverYearThree.ControlContentsChanged, ucrReceiverMonthThree.ControlContentsChanged, ucrReceiverDayThree.ControlContentsChanged, ucrInputDayThree.ControlContentsChanged, ucrInputMonthThree.ControlContentsChanged, ucrInputYearThree.ControlContentsChanged, ucrPnlYearType.ControlContentsChanged, ucrPnlMonthType.ControlContentsChanged, ucrPnlDayType.ControlContentsChanged, ucrPnlDate.ControlContentsChanged
         TestOKEnabled()
     End Sub
 End Class
diff --git a/instat/dlgModelling.Designer.vb b/instat/dlgModelling.Designer.vb