Merge pull request #102 from corywalker/corywalker

Corywalker

.gitattributes

@@ -0,0 +1 @@
+expreduce/resources.go linguist-generated=true

expreduce/builtin_flowcontrol.go

@@ -128,6 +128,20 @@ func GetFlowControlDefinitions() (defs []Definition) {
 			return &Symbol{"System`Null"}
 		},
 	})
+	defs = append(defs, Definition{
+		Name: "Switch",
+		legacyEvalFn: func(this *Expression, es *EvalState) Ex {
+			if len(this.Parts) < 4  || len(this.Parts) % 2 != 0 {
+				return this
+			}
+			for i := 2; i < len(this.Parts); i += 2 {
+				if match, _ := IsMatchQ(this.Parts[1], this.Parts[i], EmptyPD(), es); match {
+					return this.Parts[i+1]
+				}
+			}
+			return this
+		},
+	})
 	defs = append(defs, Definition{
 		Name: "With",
 		legacyEvalFn: func(this *Expression, es *EvalState) Ex {

expreduce/builtin_list.go

@@ -578,5 +578,9 @@ func GetListDefinitions() (defs []Definition) {
 	defs = append(defs, Definition{Name: "Last"})
 	defs = append(defs, Definition{Name: "First"})
 	defs = append(defs, Definition{Name: "Rest"})
+	defs = append(defs, Definition{
+		Name:         "ReplacePart",
+		OmitDocumentation: true,
+	})
 	return
 }

expreduce/builtin_numbertheory.go

@@ -146,5 +146,9 @@ func GetNumberTheoryDefinitions() (defs []Definition) {
 	})*/
 	defs = append(defs, Definition{Name: "EvenQ"})
 	defs = append(defs, Definition{Name: "OddQ"})
+	defs = append(defs, Definition{
+		Name:         "FactorInteger",
+		OmitDocumentation: true,
+	})
 	return
 }

expreduce/resources/flowcontrol.m

@@ -71,6 +71,20 @@
     ]
 };
 
+Switch::usage = "`Switch[e, case1, val1, case2, val2, ...]` attempts to match `e` with the cases in order. If a match is found, returns the corresponding value..";
+Attributes[Switch] = {HoldRest, Protected, ReadProtected};
+Tests`Switch = {
+    ESimpleExamples[
+        ESameTest[b, Switch[z,_,b,z,c]],
+        ESameTest[k, Switch[z,k_Symbol,k]],
+        ESameTest[Switch[z,1], Switch[z,1]],
+        ESameTest[Switch[z,d,b,l,c], Switch[z,d,b,l,c]]
+    ], ETests[
+        ESameTest[Switch[], Switch[]],
+        ESameTest[Switch[z], Switch[z]]
+    ]
+};
+
 With::usage = "`With[{s1=v1, s2=v2, ...}, body]` locally replaces the specified symbols in body with their respective values.";
 Attributes[With] = {HoldAll, Protected};
 Tests`With = {

expreduce/resources/list.m

@@ -378,3 +378,10 @@
         ESameTest[foo[a,b,c], Join[foo[a],foo[b,c]]]
     ]
 };
+
+ReplacePart[e_?((! AtomQ[#]) &), r_, i_Integer?Positive] :=
+
+  If[i <= Length[e] === True,
+   Join[e[[1 ;; i - 1]], Head[e][r], e[[i + 1 ;; Length[e]]]],
+   Print["Index too large for ReplacePart!"]];
+ReplacePart[___] := Print["Invalid call to ReplacePart!"];

expreduce/resources/numbertheory.m

@@ -137,3 +137,11 @@
         ESameTest[OddQ[a], OddQ[a]]
     ]
 };
+
+FactorInteger[n_] := Switch[n,
+    -20, {{-1,1},{2,2},{5,1}},
+    1, {{1, 1}},
+    2, {{2, 1}},
+    3, {{3, 1}},
+    Rational[21,4], {{2, -2}, {3, 1}, {7, 1}},
+    _, Print["Invalid call to FactorInteger!", n]];