Remove the other String functions.

corywalker · Oct 26, 2018 · 671ca5d · 671ca5d
1 parent 1a2dcc2
commit 671ca5d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 48 deletions.
diff --git a/expreduce/atoms/ex_complex.go b/expreduce/atoms/ex_complex.go
@@ -22,12 +22,6 @@ func (cmplx *Complex) StringForm(p expreduceapi.ToStringParams) string {
 	return fmt.Sprintf("(%v + %v*I)", cmplx.Re.StringForm(p), cmplx.Im.StringForm(p))
 }
 
-func (cmplx *Complex) String(esi expreduceapi.EvalStateInterface) string {
-	context, contextPath := defaultStringFormArgs()
-	return cmplx.StringForm(expreduceapi.ToStringParams{
-		Form: "InputForm", Context: context, ContextPath: contextPath, Esi: esi})
-}
-
 func (cmplx *Complex) IsEqual(other expreduceapi.Ex) string {
 	otherConv, otherIsComplex := other.(*Complex)
 	if !otherIsComplex {

diff --git a/expreduce/atoms/ex_expression.go b/expreduce/atoms/ex_expression.go
@@ -130,12 +130,6 @@ func (thisExpr *Expression) StringForm(params expreduceapi.ToStringParams) strin
 	return buffer.String()
 }
 
-func (thisExpr *Expression) String(esi expreduceapi.EvalStateInterface) string {
-	context, contextPath := defaultStringFormArgs()
-	return thisExpr.StringForm(expreduceapi.ToStringParams{
-		Form: "InputForm", Context: context, ContextPath: contextPath, Esi: esi})
-}
-
 func (thisExpr *Expression) IsEqual(otherEx expreduceapi.Ex) string {
 	other, ok := otherEx.(*Expression)
 	if !ok {

diff --git a/expreduce/atoms/ex_integer.go b/expreduce/atoms/ex_integer.go
@@ -31,11 +31,6 @@ func (thisInt *Integer) StringForm(params expreduceapi.ToStringParams) string {
 	return fmt.Sprintf("%d", thisInt.Val)
 }
 
-func (thisInt *Integer) String(esi expreduceapi.EvalStateInterface) string {
-	context, contextPath := defaultStringFormArgs()
-	return thisInt.StringForm(expreduceapi.ToStringParams{Form: "InputForm", Context: context, ContextPath: contextPath, Esi: esi})
-}
-
 func (thisInt *Integer) IsEqual(other expreduceapi.Ex) string {
 	otherConv, ok := other.(*Integer)
 	if !ok {

diff --git a/expreduce/atoms/ex_rational.go b/expreduce/atoms/ex_rational.go
@@ -28,11 +28,6 @@ func (thisRational *Rational) StringForm(params expreduceapi.ToStringParams) str
 	return fmt.Sprintf("%d/%d", thisRational.Num, thisRational.Den)
 }
 
-func (thisRational *Rational) String(esi expreduceapi.EvalStateInterface) string {
-	context, contextPath := defaultStringFormArgs()
-	return thisRational.StringForm(expreduceapi.ToStringParams{Form: "InputForm", Context: context, ContextPath: contextPath, Esi: esi})
-}
-
 func (thisRational *Rational) IsEqual(other expreduceapi.Ex) string {
 	otherConv, otherIsRational := other.(*Rational)
 	if !otherIsRational {

diff --git a/expreduce/atoms/ex_real.go b/expreduce/atoms/ex_real.go
@@ -42,11 +42,6 @@ func (flt *Flt) StringForm(params expreduceapi.ToStringParams) string {
 	return buffer.String()
 }
 
-func (flt *Flt) String(esi expreduceapi.EvalStateInterface) string {
-	context, contextPath := defaultStringFormArgs()
-	return flt.StringForm(expreduceapi.ToStringParams{Form: "InputForm", Context: context, ContextPath: contextPath, Esi: esi})
-}
-
 func (flt *Flt) IsEqual(other expreduceapi.Ex) string {
 	otherConv, ok := other.(*Flt)
 	if !ok {

diff --git a/expreduce/atoms/ex_string.go b/expreduce/atoms/ex_string.go
@@ -20,11 +20,6 @@ func (str *String) StringForm(params expreduceapi.ToStringParams) string {
 	return fmt.Sprintf("\"%v\"", str.Val)
 }
 
-func (str *String) String(esi expreduceapi.EvalStateInterface) string {
-	context, contextPath := defaultStringFormArgs()
-	return str.StringForm(expreduceapi.ToStringParams{Form: "InputForm", Context: context, ContextPath: contextPath, Esi: esi})
-}
-
 func (str *String) IsEqual(other expreduceapi.Ex) string {
 	otherConv, ok := other.(*String)
 	if !ok {

diff --git a/expreduce/atoms/ex_symbol.go b/expreduce/atoms/ex_symbol.go
@@ -50,11 +50,6 @@ func (sym *Symbol) StringForm(params expreduceapi.ToStringParams) string {
 	return formatSymName(sym.Name, params)
 }
 
-func (sym *Symbol) String(esi expreduceapi.EvalStateInterface) string {
-	context, contextPath := defaultStringFormArgs()
-	return sym.StringForm(expreduceapi.ToStringParams{Form: "InputForm", Context: context, ContextPath: contextPath, Esi: esi})
-}
-
 func (sym *Symbol) IsEqual(other expreduceapi.Ex) string {
 	otherConv, ok := other.(*Symbol)
 	if !ok {

diff --git a/expreduce/cas_test.go b/expreduce/cas_test.go
@@ -114,6 +114,7 @@ func TestLowLevel(t *testing.T) {
 	fmt.Println("Testing low-level structs")
 
 	es := NewEvalState()
+	stringParams := ActualStringFormArgsFull("InputForm", es)
 
 	lhs := atoms.NewExpression([]expreduceapi.Ex{
 		atoms.NewSymbol("System`Power"),
@@ -147,9 +148,9 @@ func TestLowLevel(t *testing.T) {
 
 	// Test basic float functionality
 	var f *atoms.Flt = atoms.NewReal(big.NewFloat(5.5))
-	assert.Equal(t, "5.5", f.String(es))
+	assert.Equal(t, "5.5", f.StringForm(stringParams))
 	es.Eval(f)
-	assert.Equal(t, "5.5", f.String(es))
+	assert.Equal(t, "5.5", f.StringForm(stringParams))
 
 	// Test nested addition functionality
 	var a = atoms.NewExpression([]expreduceapi.Ex{
@@ -173,14 +174,13 @@ func TestLowLevel(t *testing.T) {
 
 	// Test evaluation
 	newa := es.Eval(a)
-	stringParams := ActualStringFormArgsFull("InputForm", es)
 	assert.Equal(t, "87.5", newa.StringForm(stringParams))
 
 	// Test basic Symbol functionality
 	var v *atoms.Symbol = atoms.NewSymbol("System`x")
-	assert.Equal(t, "x", v.String(es))
+	assert.Equal(t, "x", v.StringForm(stringParams))
 	es.Eval(v)
-	assert.Equal(t, "x", v.String(es))
+	assert.Equal(t, "x", v.StringForm(stringParams))
 
 	casAssertSame(t, es, "(a + b + c + d + e + f)", "a + b + c +d +e +f")
 	casAssertSame(t, es, "(a*b*c*d*e*f)", "a * b * c *d *e *f")
@@ -202,6 +202,7 @@ func TestDeepCopy(t *testing.T) {
 
 	// So that we can print the values. Not very necessary.
 	es := NewEvalState()
+	stringParams := ActualStringFormArgsFull("InputForm", es)
 
 	// Test deepcopy
 	var t1 = atoms.NewSymbol("System`x")
@@ -219,14 +220,14 @@ func TestDeepCopy(t *testing.T) {
 	var t4 = atoms.NewReal(big.NewFloat(2))
 	t5 := *t4
 	t6 := t4.DeepCopy().(*atoms.Flt)
-	assert.Equal(t, "2.", t4.String(es))
-	assert.Equal(t, "2.", t5.String(es))
-	assert.Equal(t, "2.", t6.String(es))
+	assert.Equal(t, "2.", t4.StringForm(stringParams))
+	assert.Equal(t, "2.", t5.StringForm(stringParams))
+	assert.Equal(t, "2.", t6.StringForm(stringParams))
 	t5.Val.Add(t5.Val, big.NewFloat(2))
 	t6.Val.Add(t6.Val, big.NewFloat(3))
-	assert.Equal(t, "4.", t4.String(es)) // Because we used the wrong copy method
-	assert.Equal(t, "4.", t5.String(es))
-	assert.Equal(t, "5.", t6.String(es))
+	assert.Equal(t, "4.", t4.StringForm(stringParams)) // Because we used the wrong copy method
+	assert.Equal(t, "4.", t5.StringForm(stringParams))
+	assert.Equal(t, "5.", t6.StringForm(stringParams))
 }
 
 func TestConcurrency(t *testing.T) {