*** empty log message ***

* empty log message *
Alain Prouté
1 parent 877ad521
Showing 3 changed files with 37 additions and 28 deletions Show diff stats
anubis_dev/library/syntactic_analysis/calculator.apm
anubis_dev/library/syntactic_analysis/parser_maker.anubis
anubis_dev/library/system/parameter/inifile.anubis
@@ -19,6 +19,7 @@ define Int32
  
 #calc_parser
  
+left low.    
 right plus. 
 right times. 
 left  power.
@@ -94,6 +95,7 @@ define TokenValue_calc_parser
          {
            failure then eof(unique), 
            success(c) then
+             if c = '\n'          then  eof(unique)                          else
              if c = '('           then  _lpar(unique)                        else
              if c = ')'           then  _rpar(unique)                        else
              if c = '+'           then  _plus(unique)                        else
@@ -2284,11 +2284,11 @@ define (List((String,List(ExToken))),Int32)
  
         A -> uv
  
-   then it  is possible  that after having  read an  instance of v,  we reduce  using that
-   rule. Furthermore, the automaton  is able to look at the next token  to be read (it has
-   one token of  'lookahead'). This helps to  make decisions, as we will  see later, using
-   precedence and  association rules.  In particular, the  automaton knows which  token is
-   allowded as the lookahead for a given reduction.
+   then it is possible  that after a further reading of an instance  of v, we reduce using
+   that rule. Furthermore, the automaton is able to  look at the next token to be read (it
+   has one  token of 'lookahead').  This helps  to make decisions,  as we will  see later,
+   using precedence and association rules.  In particular, the automaton knows which token
+   is allowded as the lookahead for a given reduction.
  
    Hence, we introduce the notion of a scenario. A 'scenario' is a pair, denoted (in these
    explanations):
@@ -2385,10 +2385,8 @@ type Scenario:
  
  
  
-
-
-
-
+   
+   
  
       *** (3.4) Testing for similarity. 
  
@@ -3322,8 +3320,6 @@ define List(IntermediateState)
    are called 'reducing' scenarii, because they call for a reduction.
  
  
- type NonEmptyList($T):
-  [$T . List($T)]. 
  
 type ShiftingScenario:
   shifting_scenario(Int32                 id,
@@ -4483,7 +4479,9 @@ define One
        List(SymbolType)          types_table,
        List((ExSymbol,Int32))    transitions,
        List(ShiftingScenario)    ss,
-       List(Option)              options
+       List(Option)              options,
+       String                    state_id, 
+       Int32                     num_args
      ) =
    if types_table is 
      {
@@ -4491,20 +4489,29 @@ define One
        [h . t] then if h is symtype(sym,type) then
          if sym is 
            {
-             token(name)        then print_restart_cases(t,transitions,ss,options),
+             token(name)        then print_restart_cases(t,transitions,ss,options,state_id,num_args),
              non_terminal(name) then 
-               print(right_pad("       "+name+"(value)",40)+" then ");
+               print(right_pad("       "+name+"(value)",20)+" then ");
                (if member(verbose,options)
-                then print("print(\"Got a '"+name+"'\\n\");\n                              ")
+                then print("print(\"Got a '"+name+"'\\n\");\n                            ")
                 else unique);
                if find_transition(name,transitions) is 
                  {
-                   failure      then print("alert\n")
-                   success(p)   then print("state_"+integer_to_string(p)+"(input,value,"+
+                   failure      then if state_id = "0"
+                                     then print("end_ret(start(value))\n") // accept
+                                     else print("alert\n"),
+                   success(p)   then 
+                     print("if state_"+integer_to_string(p)+"(input,value,"+
                                     format_restart_case_args(
-                                      length(get_longuest_stack_for(name,ss))-1)+")\n")
+                                      length(get_longuest_stack_for(name,ss))-1)+") is\n");
+               print("                    {\n");
+               print("                      error(a,b) then error(a,b),\n");
+               print("                      end_ret(v) then restart_"+state_id+"(input,v,"+
+                           format_restart_case_args(num_args)+"),\n");
+               print("                      do_ret(v)  then v,\n");
+               print("                    }\n")
                  };
-               print_restart_cases(t,transitions,ss,options)
+               print_restart_cases(t,transitions,ss,options,state_id,num_args)
            }
      }. 
  
@@ -4654,7 +4661,7 @@ define One
    else unique);
   print("   if result is\n");
   print("     {\n");
-  print_restart_cases(types_table,tr,ss,options);
+  print_restart_cases(types_table,tr,ss,options,n,length(stack)-1);
   print("     }.\n");
  
   print("\n\ndefine Ret(NonTerminalValue)\n");
@@ -5084,7 +5091,7 @@ define One
              else unique); 
             print("   "+put_do_ret(
                                   head+"("+term+")",
-                                  length(body)-1
+                                  length(body)
                                   )+".\n")
             )
          );
@@ -146,7 +146,7 @@ define One parseSection (String line, IniInfo ini ) =
       if sub_string(line, 1, idx-1) is
       {
         failure then alert
-        success(section) then addSection(ini, section);
+        success(section) then addSection(ini, section)
       }
   }
   . 
@@ -231,14 +231,14 @@ public define IniInfo loadIniFile( String fileName) =
  
  
  
-type IniLine:   
+ type IniLine:   
    eof, 
    blank, 
    section_header(String name), 
    variable(String name, String value),
    comment(String). 
  
-define IniLine parseIniLine (String line) =
+ define IniLine parseIniLine (String line) =
    if nth(0,line) is 
      {
        failure then blank, 
@@ -250,22 +250,22 @@ define IniLine parseIniLine (String line) =
               else variable(parseVarLine(line))
      }.
  
-define IniLine parseIniLine (Stream s) =
+ define IniLine parseIniLine (Stream s) =
    if read_line(s) is 
      {
        failure then eof, 
        success(l) then parseIniLine(l)
      }.
  
-type IniVar:
+ type IniVar:
    iniVar(String       name, 
           Var(String)  value). 
  
-type IniSection:
+ type IniSection:
    iniSection(String              name,
               Var(List(IniVar))   content). 
  
-type IniInfo:
+ type IniInfo:
    iniInfo(String                 fileName, 
            Var(List(IniSection))  content).