Merge pull request #1277 from Alex-Jordan/parens-only

only use parentheses (not brackets) for Formula strings

Author: drgrice1

lib/Parser/Context/Default.pm

@@ -434,6 +434,7 @@ $flags = {
 	reduceConstants            => 1,              # 1 = automatically combine constants
 	reduceConstantFunctions    => 1,              # 1 = compute function values of constants
 	showExtraParens            => 1,              # 1 = add useful parens, 2 = make things painfully unambiguous
+	stringifyNoBrackets        => 0,              # 1 = only use parentheses not brackets when stringifying
 	formatStudentAnswer        => 'evaluated',    # or 'parsed' or 'reduced'
 	allowMissingOperands       => 0,              # 1 is used by Typeset context
 	allowMissingFunctionInputs => 0,              # 1 is used by Typeset context

lib/Parser/Item.pm

@@ -113,12 +113,12 @@ sub canBeInUnion {0}
 sub isSetOfReals { (shift)->type =~ m/^(Interval|Union|Set)$/ }
 
 #
-#  Add parens to an expression (alternating the type of paren)
+#  Add parens to an expression (alternating the type of paren unless stringifyNoBrackets is set)
 #
 sub addParens {
 	my $self   = shift;
 	my $string = shift;
-	if ($string =~ m/^[^\[]*\(/) { return '[' . $string . ']' }
+	return '[' . $string . ']' if $string =~ m/^[^\[]*\(/ && !$self->context->flag('stringifyNoBrackets');
 	return '(' . $string . ')';
 }
 

lib/Plots/Data.pm

@@ -260,7 +260,8 @@ sub function_string {
 	my $format      = $formula->context->{format}{number};
 	$formula->context->flags->set(showExtraParens => 2);
 	$formula->context->{format}{number} = "%f#";
-	my $func = $formula->string;
+	# Get no bracket string for $formula
+	my $func = $formula . "";
 	$func =~ s/\s//g;
 	$formula->context->flags->set(showExtraParens => $extraParens);
 	$formula->context->{format}{number} = $format;
@@ -368,8 +369,6 @@ sub function_string {
 		}
 	}
 
-	$out =~ s/\[/(/g;
-	$out =~ s/\]/)/g;
 	return $out;
 }
 

lib/Value/Formula.pm

@@ -112,7 +112,14 @@ sub _dot {
 	$l->SUPER::_dot($r, $flag);
 }
 
-sub pdot { '(' . (shift->stringify) . ')' }
+sub pdot {
+	my $self       = shift;
+	my $nobrackets = $self->context->flag('stringifyNoBrackets');
+	$self->context->flags->set(stringifyNoBrackets => 1);
+	my $string = '(' . ($self->stringify) . ')';
+	$self->context->flags->set(stringifyNoBrackets => $nobrackets);
+	return $string;
+}
 
 #
 #  Call the Parser::Function call function