[BACK]Return to AlgParser.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml / algebra

Diff for /loncom/xml/algebra/AlgParser.pm between versions 1.1 and 1.2

version 1.1, 2005/02/24 01:21:51 version 1.2, 2005/02/24 06:21:10
Line 6 Line 6
 ## Additions and modifications were made by Arnold Pizer, Dept of Math, Univ of Rochester  ## Additions and modifications were made by Arnold Pizer, Dept of Math, Univ of Rochester
   
 #use Data::Dumper;  #use Data::Dumper;
   use strict;
   
 package AlgParser;  package AlgParser;
 use HTML::Entities;  use HTML::Entities;
   
 %close = ();  my %close = ();
   
 sub new {  sub new {
   my $package = shift;    my $package = shift;
Line 36  $close{'{'} = '}'; Line 37  $close{'{'} = '}';
 $close{'['} = ']';  $close{'['} = ']';
 $close{'('} = ')';  $close{'('} = ')';
   
 $binoper3 = '(?:\\^|\\*\\*)';  my $binoper3 = '(?:\\^|\\*\\*)';
 $binoper2 = '[/*_,]';  my $binoper2 = '[/*_,]';
 $binoper1 = '[-+=><%!#]';  my $binoper1 = '[-+=><%!#]';
 $openparen = '[{(\\[]';  my $openparen = '[{(\\[]';
 $closeparen = '[})\\]]';  my $closeparen = '[})\\]]';
 $varname = '[A-Za-z](?:_[0-9]+)?';  my $varname = '[A-Za-z](?:_[0-9]+)?';
 $specialvalue = '(?:e|pi|da|db|dc|de|df|dg|dh|di|dj|dk|dl|dm|dn|do|dp|dq|dr|ds|dt|du|dv|dw|dx|dy|dz|infty|alpha|bita|gamma|zita|thita|iota|kappa|lambda|mu|nu|xi|rho|sigma|tau|phi|chi|psi|omega|zepslon|zdelta|xeta|zupslon|zeroplace)';  my $specialvalue = '(?:e|pi|da|db|dc|de|df|dg|dh|di|dj|dk|dl|dm|dn|do|dp|dq|dr|ds|dt|du|dv|dw|dx|dy|dz|infty|alpha|bita|gamma|zita|thita|iota|kappa|lambda|mu|nu|xi|rho|sigma|tau|phi|chi|psi|omega|zepslon|zdelta|xeta|zupslon|zeroplace)';
 $numberplain = '(?:\d+(?:\.\d*)?|\.\d+)';  my $numberplain = '(?:\d+(?:\.\d*)?|\.\d+)';
 $numberE = '(?:' . $numberplain . 'E[-+]?\d+)';  my $numberE = '(?:' . $numberplain . 'E[-+]?\d+)';
 $number = '(?:' . $numberE . '|' . $numberplain . ')';  my $number = '(?:' . $numberE . '|' . $numberplain . ')';
 #  #
 #  DPVC -- 2003/03/31  #  DPVC -- 2003/03/31
 #       added missing trig and inverse functions  #       added missing trig and inverse functions
 #  #
 #$trigfname = '(?:cosh|sinh|tanh|cot|(?:a(?:rc)?)?cos|(?:a(?:rc)?)?sin|' .  #$trigfname = '(?:cosh|sinh|tanh|cot|(?:a(?:rc)?)?cos|(?:a(?:rc)?)?sin|' .
 #    '(?:a(?:rc)?)?tan|sech?)';  #    '(?:a(?:rc)?)?tan|sech?)';
 $trigfname = '(?:(?:a(?:rc)?)?(?:sin|cos|tan|sec|csc|cot)h?)';  my $trigfname = '(?:(?:a(?:rc)?)?(?:sin|cos|tan|sec|csc|cot)h?)';
 #  #
 #  End DPVC  #  End DPVC
 #  #
 $otherfunc = '(?:exp|abs|logten|log|ln|sqrt|sgn|step|fact|int|lim|fun[a-zA-Z])';  my $otherfunc = '(?:exp|abs|logten|log|ln|sqrt|sgn|step|fact|int|lim|fun[a-zA-Z])';
 $funcname = '(?:' . $otherfunc . '|' . $trigfname . ')';  my $funcname = '(?:' . $otherfunc . '|' . $trigfname . ')';
   
 $tokenregexp = "(?:($binoper3)|($binoper2)|($binoper1)|($openparen)|" .  my $tokenregexp = "(?:($binoper3)|($binoper2)|($binoper1)|($openparen)|" .
     "($closeparen)|($funcname)|($specialvalue)|($varname)|" .      "($closeparen)|($funcname)|($specialvalue)|($varname)|" .
     "($numberE)|($number))";      "($numberE)|($number))";
   
Line 95  sub parse { Line 96  sub parse {
   my (@pushback) = ();    my (@pushback) = ();
   
   my $currentref = \$self->{parseresult}->[1];    my $currentref = \$self->{parseresult}->[1];
   my $curenttok;    my $currenttok;
   
   my $sstring = shift;    my $sstring = shift;
   $self->inittokenizer($sstring);    $self->inittokenizer($sstring);
Line 383  sub normalize_expr { Line 384  sub normalize_expr {
 }  }
   
 package AlgParserWithImplicitExpand;  package AlgParserWithImplicitExpand;
   no strict;
 @ISA=qw(AlgParser);  @ISA=qw(AlgParser);
   use strict;
   
 sub arraytoexpr {  sub arraytoexpr {
   my ($self) = shift;    my ($self) = shift;
Line 558  sub tolatex { Line 561  sub tolatex {
  return('\frac{' . $args[1]->tolatex() . '}'.   return('\frac{' . $args[1]->tolatex() . '}'.
                '{' . $args[2]->tolatex() . '}' );                  '{' . $args[2]->tolatex() . '}' ); 
     }      }
       elsif ($args[0] eq '*'){
   # return('\frac{' . $p1 . $args[1]->tolatex() . $p2 . '}'.
   #               '{' . $p3 . $args[2]->tolatex() . $p4 . '}' );
    return($args[1]->tolatex() . '\cdot ' . $args[2]->tolatex() ); 
       }
     else{      else{
     return ($p1 . $args[1]->tolatex() . $p2 . $args[0] . $p3 .      return ($p1 . $args[1]->tolatex() . $p2 . $args[0] . $p3 .
             $args[2]->tolatex() . $p4);              $args[2]->tolatex() . $p4);
Line 582  sub tolatex { Line 590  sub tolatex {
       #       added missing trig functions        #       added missing trig functions
       #        #
       #$specialfunc = '(?:abs|logten|asin|acos|atan|sech|sgn|step|fact)';        #$specialfunc = '(?:abs|logten|asin|acos|atan|sech|sgn|step|fact)';
       $specialfunc = '(?:abs|logten|a(?:sin|cos|tan|sec|csc|cot)h?|sgn|step|fact)';        my $specialfunc = '(?:abs|logten|a(?:sin|cos|tan|sec|csc|cot)h?|sgn|step|fact)';
       #        #
       #  End DPVC        #  End DPVC
       #        #
Line 628  sub fromarray { Line 636  sub fromarray {
 }  }
   
 package ExprWithImplicitExpand;  package ExprWithImplicitExpand;
   no strict;
 @ISA=qw(Expr);  @ISA=qw(Expr);
   use strict;
   
 sub tostring {  sub tostring {
 # print STDERR "ExprWIE::tostring\n";  # print STDERR "ExprWIE::tostring\n";
Removed from v.1.1  
changed lines
  Added in v.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>