Skip to content
Snippets Groups Projects
Commit b99d8a8c authored by Chris Sangwin's avatar Chris Sangwin
Browse files

Code tidy.

parent 16cde5d4
Branches
No related tags found
No related merge requests found
......@@ -97,17 +97,18 @@ class stack_cas_casstring {
'concat' => true, 'current_let_rule_package' => true, 'data_file_name' => true, 'deactivate' => true,
'debugmode' => true, 'define' => true, 'define_variable' => true, 'del_cmd' => true, 'demo' => true,
'dependencies' => true, 'describe' => true, 'dimacs_export' => true, 'dimacs_import' => true, 'entermatrix' => true,
'errcatch' => true, 'error' => true, 'error_size' => true, 'error_syms' => true, 'errormsg' => true, 'eval_string' => true,
'example' => true, 'feature' => true, 'featurep' => true, 'features' => true, 'file_name' => true,
'file_output_append' => true, 'file_search' => true, 'file_search_demo' => true, 'file_search_lisp' => true,
'file_search_maxima' => true, 'file_search_tests' => true, 'file_search_usage' => true, 'file_type' => true,
'filename_merge' => true, 'flength' => true, 'fortindent' => true, 'fortran' => true, 'fortspaces' => true,
'fposition' => true, 'freshline' => true, 'functions' => true, 'fundef' => true, 'funmake' => true,
'grind' => true, 'gnuplot_file_name' => true, 'gnuplot_out_file' => true, 'gnuplot_preamble' => true,
'gnuplot_ps_term_command' => true, 'gnuplot_cmd' => true, 'gnuplot_term' => true, 'inchar' => true,
'infeval' => true, 'infolists' => true, 'kill' => true, 'killcontext' => true, 'labels' => true,
'leftjust' => true,', ldisp' => true, 'ldisplay' => true, 'lisp' => true, 'linechar' => true, 'linel' => true,
'linenum' => true, 'linsolvewarn' => true, 'load' => true, 'load_pathname' => true, 'loadfile' => true, 'loadprint' => true,
'errcatch' => true, 'error' => true, 'error_size' => true, 'error_syms' => true, 'errormsg' => true,
'eval_string' => true, 'example' => true, 'feature' => true, 'featurep' => true, 'features' => true,
'file_name' => true, 'file_output_append' => true, 'file_search' => true, 'file_search_demo' => true,
'file_search_lisp' => true, 'file_search_maxima' => true, 'file_search_tests' => true,
'file_search_usage' => true, 'file_type' => true, 'filename_merge' => true, 'flength' => true,
'fortindent' => true, 'fortran' => true, 'fortspaces' => true, 'fposition' => true, 'freshline' => true,
'functions' => true, 'fundef' => true, 'funmake' => true, 'grind' => true, 'gnuplot_file_name' => true,
'gnuplot_out_file' => true, 'gnuplot_preamble' => true, 'gnuplot_ps_term_command' => true,
'gnuplot_cmd' => true, 'gnuplot_term' => true, 'inchar' => true, 'infeval' => true, 'infolists' => true,
'kill' => true, 'killcontext' => true, 'labels' => true, 'leftjust' => true, 'ldisp' => true,
'ldisplay' => true, 'lisp' => true, 'linechar' => true, 'linel' => true, 'linenum' => true,
'linsolvewarn' => true, 'load' => true, 'load_pathname' => true, 'loadfile' => true, 'loadprint' => true,
'macroexpand' => true, 'macroexpand1' => true, 'macroexpansion' => true, 'macros' => true, 'manual_demo' => true,
'maxima_tempdir' => true, 'maxima_userdir' => true, 'multiplot_mode' => true, 'myoptions' => true,
'newline' => true, 'nolabels' => true, 'opena' => true, 'opena_binary' => true, 'openr' => true,
......
......@@ -117,6 +117,21 @@ class stack_string_input extends stack_algebraic_input {
return $response;
}
/**
* Transforms the contents array into a maxima expression.
* Most simply take the casstring from the first element of the contents array.
*
* @param array|string $in
* @return string
*/
public function contents_to_maxima($contents) {
if (array_key_exists(0, $contents)) {
return $this->ensure_string($contents[0]);
} else {
return '';
}
}
private function strip_string($ex) {
$ex = trim($ex);
if (substr($ex, 0, 1) === '"') {
......
......@@ -927,7 +927,7 @@ class stack_cas_casstring_test extends basic_testcase {
$this->assertEquals('logsubs', $at1->get_answernote());
}
public function test_chained_inequalities_S() {
public function test_chained_inequalities_s() {
$s = 'sa:3<x<5';
$at1 = new stack_cas_casstring($s);
$this->assertFalse($at1->get_valid('s', true, 0));
......@@ -936,7 +936,7 @@ class stack_cas_casstring_test extends basic_testcase {
$this->assertEquals('chained_inequalities', $at1->get_answernote());
}
public function test_chained_inequalities_T() {
public function test_chained_inequalities_t() {
$s = 'f(x) := if x < 0 then (if x < 1 then 1 else 2) else 3';
$at1 = new stack_cas_casstring($s);
$this->assertTrue($at1->get_valid('t', true, 0));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment