Changeset 3752


Ignore:
Timestamp:
Apr 20, 2008, 4:09:20 PM (13 years ago)
Author:
yura
Message:
  • Variables name in functions format are more accurate.
Location:
to-imperative/trunk/java/refal/refal/plus
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • to-imperative/trunk/java/refal/refal/plus/Convert.rf

    r3616 r3752  
     1// $Id$
     2
    13$use "Lexer";
    24$use "Stream";
  • to-imperative/trunk/java/refal/refal/plus/Convert.rfi

    r3614 r3752  
    33$module "refal.plus.Convert";
    44
    5 $func CharsToBytes e.Char = e.Int;
    6 $func BytesToChars e.Int  = e.Char;
    7 $func ToLower      e.Char = e.Char;
    8 $func ToUpper      e.Char = e.Char;
     5$func CharsToBytes e.chars = e.bytes;
     6$func BytesToChars e.bytes = e.chars;
     7$func ToLower      e.chars = e.chars;
     8$func ToUpper      e.chars = e.chars;
    99
    10 $func? ToInt   e.Exp = s.Int;
    11 $func  ToChars e.Exp = e.Char;
    12 $func  ToWord  e.Exp = s.Word;
     10$func? ToInt   e.expr = s.int;
     11$func  ToChars e.expr = e.chars;
     12$func  ToWord  e.expr = s.word;
    1313
    14 $func? Read_Expr e.Exp = e.Exp;
     14$func? Read_Expr e.expr = e.expr;
  • to-imperative/trunk/java/refal/refal/plus/CppMangle.rfi

    r3614 r3752  
    33$module "refal.plus.CppMangle";
    44
    5 $func Rfp2Cpp e.rfp_obj = e.cpp_identifier;
     5$func Rfp2Cpp e.rfpObj = e.cppIdentifier;
    66
    7 $func? Cpp2Rfp e.cpp_identifier = e.rfp_name;
     7$func? Cpp2Rfp e.cppIdentifier = e.rfpName;
  • to-imperative/trunk/java/refal/refal/plus/Error.rfi

    r3614 r3752  
    33$module "refal.plus.Error";
    44
    5 $func Lib_Error (e.fname) error = ;
     5$func Lib_Error (e.funcName) e.error = ;
    66
    77$func Not_Available e.name = ;
  • to-imperative/trunk/java/refal/refal/plus/IndexedStream.rfi

    r3734 r3752  
    33//$include IStream;
    44
    5 $func Name   stream = e.name;
    6 $func Row    stream = s.row;
    7 $func Column stream = s.column;
     5$func Name   s.stream = e.name;
     6$func Row    s.stream = s.row;
     7$func Column s.stream = s.column;
    88
    9 $func Current_Pos stream = t.position;
     9$func Current_Pos s.stream = t.position;
    1010
  • to-imperative/trunk/java/refal/refal/plus/JavaMangle.rfi

    r3656 r3752  
    33$module "refal.plus.JavaMangle";
    44
    5 $func Rfp2Java e.rfp_obj = e.java_identifier;
     5$func Rfp2Java e.rfpObj = e.javaIdentifier;
    66
    7 $func? Java2Rfp e.java_identifier = e.rfp_name;
     7$func? Java2Rfp e.javaIdentifier = e.rfpName;
  • to-imperative/trunk/java/refal/refal/plus/Lexer.rfi

    r3614 r3752  
    11// $Id$
    22
    3 $func? IsSkip_Blank       stream = ;
    4 $func? IsSkip_Comment     stream = ;
    5 $func? IsScan_Keyword     stream = e.token;
    6 $func? IsScan_Number      stream = e.token;
    7 $func? IsScan_Variable    stream = e.token;
    8 $func? IsScan_Identifier  stream = e.token;
    9 $func? IsScan_Quoted_Word stream = e.token;
    10 $func? IsScan_String      stream = e.token;
    11 $func? IsScan_Char        stream = e.token;
     3$func? IsSkip_Blank       s.stream = ;
     4$func? IsSkip_Comment     s.stream = ;
     5$func? IsScan_Keyword     s.stream = e.token;
     6$func? IsScan_Number      s.stream = e.token;
     7$func? IsScan_Variable    s.stream = e.token;
     8$func? IsScan_Identifier  s.stream = e.token;
     9$func? IsScan_Quoted_Word s.stream = e.token;
     10$func? IsScan_String      s.stream = e.token;
     11$func? IsScan_Char        s.stream = e.token;
    1212
    13 $func? IsRead_Term        stream = term;
     13$func? IsRead_Term        s.stream = t.term;
    1414
    1515$func  Start_Collect_Errors = ;
  • to-imperative/trunk/java/refal/refal/plus/List.rf

    r3614 r3752  
    1 // $Source$
    2 // $Revision$
    3 // $Date$
     1// $Id$
    42
    53$use Apply Access Arithm Compare;
  • to-imperative/trunk/java/refal/refal/plus/List.rfi

    r3614 r3752  
    33$module "refal.plus.List";
    44
    5 $func Id e1 = e1;
     5$func Id e.expr = e.expr;
    66
    7 $func Append (e1) e2 = e2e1;
     7$func Append (e.expr1) e.expr2 = e.expr2expr1;
    88
    9 $func Zip (e.list1) (e.list2) = e.new_list;
     9$func Zip (e.list1) (e.list2) = e.list;
    1010
    11 $func? Map s.Fname e.Fargs (e.list) = e.new_list;
     11$func? Map s.func e.funcArgs (e.list) = e.list;
    1212
    13 $func? MapIn s.Fname e.Fargs (e.list) = e.new_list;
     13$func? MapIn s.func e.funcArgs (e.list) = e.list;
    1414
    15 $func Filter s.Fname e.Fargs (e.list) = e.new_list;
     15$func Filter s.func e.funcArgs (e.list) = e.list;
    1616
    17 $func Split s.Fname e.Fargs (e.list) = (e.true_list) (e.false_list);
     17$func Split s.func e.funcArgs (e.list) = (e.trueList) (e.falseList);
    1818
    1919$func? IsElem e.list t.item = ;
    2020
    21 $func Foldr s.Fname e.Fargs (e.value) (e.list) = e.value;
     21$func Foldr s.func e.funcArgs (e.value) (e.list) = e.value;
    2222
    23 $func Foldr1 s.Fname e.Fargs (e.list) = e.value;
     23$func Foldr1 s.func e.funcArgs (e.list) = e.value;
    2424
    25 $func? All s.Fname e.Fargs (e.list) = ;
     25$func? All s.func e.funcArgs (e.list) = ;
    2626
    27 $func? Any s.Fname e.Fargs (e.list) = ;
     27$func? Any s.func e.funcArgs (e.list) = ;
    2828
    2929$func Concat e.lists = e.list;
    3030
    31 $func Paren exprs = e.lists;
     31$func Paren e.exprs = e.lists;
    3232
    33 $func Reverse e.list = e.rev_list;
     33$func Reverse e.list = e.list;
    3434
    35 $func Intersperse (e.sep) e.list = e.new_list;
     35$func Intersperse (e.sep) e.list = e.list;
    3636
    37 $func Separate (e.sep) e.list = e.list_of_lists;
     37$func Separate (e.sep) e.list = e.listOfLists;
    3838
    39 $func Nub e.expr = e.selected;
     39$func Nub e.list = e.list;
    4040
    4141$func Replicate s.n e.expr = e.list;
     
    4949
    5050// Add to the first list all new elements from the second one.
    51 $func Or (e.list1) e.list2 = e.or;
     51$func Or (e.list1) e.list2 = e.list;
    5252
    5353// Choose from the first list all elements present in the second one.
    54 $func And (e.list1) e.list2 = e.and;
     54$func And (e.list1) e.list2 = e.list;
    5555
    5656// Choose from the first list all elements not present in the second one.
    57 $func Sub (e.list1) e.list2 = e.not;
     57$func Sub (e.list1) e.list2 = e.list;
  • to-imperative/trunk/java/refal/refal/plus/Stream.rfi

    r3614 r3752  
    11// $Id$
    22
    3 $func Stream     s.func e.args = stream;
    4 $func Expr_Open  expr          = stream;
    5 $func File_Open  e.filename    = stream;
    6 $func File_Close stream        = ;
    7 $func StdIStream               = stream;
     3$func Stream     s.func e.args = s.stream;
     4$func Expr_Open  e.expr        = s.stream;
     5$func File_Open  e.file        = s.stream;
     6$func File_Close s.stream      = ;
     7$func StdIStream               = s.stream;
    88
    99//X/*
    10 $func? Getc           stream         = term;
    11 $func? Gets           stream s.n     = expr;
    12 $func  Ungets         stream expr    = ;
    13 $func  Scanc          stream t1      = empty_or_t1;
    14 $func  Get_Delim      stream t.delim = expr;
    15 $func  Get_Line       stream         = expr;
    16 $func  Get_While      stream s.pred  = expr;
    17 $func? IsEnd_of_Stream stream         = ;
     10$func? Getc           s.stream          = t.term;
     11$func? Gets           s.stream s.length = e.expr;
     12$func  Ungets         s.stream e.expr   = ;
     13$func  Scanc          s.stream t.1      = e.empty_or_t1;
     14$func  Get_Delim      s.stream t.delim  = e.expr;
     15$func  Get_Line       s.stream          = e.expr;
     16$func  Get_While      s.stream s.pred   = e.expr;
     17$func? IsEnd_of_Stream s.stream         = ;
    1818//X*/
    1919
  • to-imperative/trunk/java/refal/refal/plus/StreamErr.rfi

    r3614 r3752  
    11// $Id$
    22
    3 $func Errors = errors;
     3$func Errors = e.errors;
    44$func Clear_Errors = ;
    55
    6 $func Error    stream e.message = ;
    7 $func Error_At t.pos  e.message = ;
     6$func Error    s.stream e.message = ;
     7$func Error_At t.pos e.message = ;
    88
    99$func Print_Errors = ;
  • to-imperative/trunk/java/refal/refal/plus/cpp_specific.rf

    r3614 r3752  
    1 // $Source$
    2 // $Revision$
    3 // $Date$
     1// $Id$
    42
    53$use Class Compare Convert;
  • to-imperative/trunk/java/refal/refal/plus/cpp_specific.rfi

    r3614 r3752  
    1 // $Source$
    2 // $Revision$
    3 // $Date$
     1// $Id$
    42
    53$func? IsReserved_Word e.word = ;
  • to-imperative/trunk/java/refal/refal/plus/java_specific.rf

    r3614 r3752  
    1 // $Source$
    2 // $Revision$
    3 // $Date$
     1// $Id$
    42
    53$use Convert;
  • to-imperative/trunk/java/refal/refal/plus/java_specific.rfi

    r3614 r3752  
    1 // $Source$
    2 // $Revision$
    3 // $Date$
     1// $Id$
    42
    53$func? IsReserved_Word e.word = ;
Note: See TracChangeset for help on using the changeset viewer.