[uim-commit] r1416 - branches/r5rs/sigscheme

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-09-04 15:02:20 -0700 (Sun, 04 Sep 2005)
New Revision: 1416

Modified:
   branches/r5rs/sigscheme/operations.c
   branches/r5rs/sigscheme/sigscheme.c
   branches/r5rs/sigscheme/sigscheme.h
Log:
* This commit renames odd arithmetic operation names to common ones

* sigscheme/sigscheme.h
* sigscheme/operations.c
  - (ScmOp_plus): Rename to ScmOp_add
  - (ScmOp_add): Renamed from ScmOp_plus
  - (ScmOp_minus): Rename to ScmOp_subtract
  - (ScmOp_subtract): Renamed from ScmOp_minus
  - (ScmOp_times): Rename to ScmOp_multiply
  - (ScmOp_multiply): Renamed from ScmOp_times
* sigscheme/sigscheme.c
  - (SigScm_Initialize): Follow the renamings


Modified: branches/r5rs/sigscheme/operations.c
===================================================================
--- branches/r5rs/sigscheme/operations.c	2005-09-04 20:43:36 UTC (rev 1415)
+++ branches/r5rs/sigscheme/operations.c	2005-09-04 22:02:20 UTC (rev 1416)
@@ -254,7 +254,7 @@
 ==============================================================================*/
 /* Note: SigScheme supports only the integer part of the numerical tower. */
 
-ScmObj ScmOp_plus(ScmObj args, ScmObj env)
+ScmObj ScmOp_add(ScmObj args, ScmObj env)
 {
     int result = 0;
     ScmObj operand = SCM_NULL;
@@ -269,7 +269,7 @@
     return Scm_NewInt(result);
 }
 
-ScmObj ScmOp_times(ScmObj args, ScmObj env)
+ScmObj ScmOp_multiply(ScmObj args, ScmObj env)
 {
     int result = 1;
     ScmObj operand = SCM_NULL;
@@ -284,7 +284,7 @@
     return Scm_NewInt(result);
 }
 
-ScmObj ScmOp_minus(ScmObj args, ScmObj env)
+ScmObj ScmOp_subtract(ScmObj args, ScmObj env)
 {
     int result = 0;
     ScmObj operand = SCM_NULL;

Modified: branches/r5rs/sigscheme/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/sigscheme.c	2005-09-04 20:43:36 UTC (rev 1415)
+++ branches/r5rs/sigscheme/sigscheme.c	2005-09-04 22:02:20 UTC (rev 1416)
@@ -162,9 +162,9 @@
     Scm_RegisterFunc1("even?"                    , ScmOp_evenp);
     Scm_RegisterFuncRawList("max"                , ScmOp_max);
     Scm_RegisterFuncRawList("min"                , ScmOp_min);
-    Scm_RegisterFuncRawList("+"                  , ScmOp_plus);
-    Scm_RegisterFuncRawList("*"                  , ScmOp_times);
-    Scm_RegisterFuncRawList("-"                  , ScmOp_minus);
+    Scm_RegisterFuncRawList("+"                  , ScmOp_add);
+    Scm_RegisterFuncRawList("*"                  , ScmOp_multiply);
+    Scm_RegisterFuncRawList("-"                  , ScmOp_subtract);
     Scm_RegisterFuncRawList("/"                  , ScmOp_divide);
     Scm_RegisterFunc1("abs"                      , ScmOp_abs);
     Scm_RegisterFunc2("quotient"                 , ScmOp_quotient);

Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h	2005-09-04 20:43:36 UTC (rev 1415)
+++ branches/r5rs/sigscheme/sigscheme.h	2005-09-04 22:02:20 UTC (rev 1416)
@@ -174,9 +174,9 @@
 ScmObj ScmOp_eqvp(ScmObj obj1, ScmObj obj2);
 ScmObj ScmOp_eqp(ScmObj obj1, ScmObj obj2);
 ScmObj ScmOp_equalp(ScmObj obj1, ScmObj obj2);
-ScmObj ScmOp_plus(ScmObj args, ScmObj env);
-ScmObj ScmOp_times(ScmObj args, ScmObj env);
-ScmObj ScmOp_minus(ScmObj args, ScmObj env);
+ScmObj ScmOp_add(ScmObj args, ScmObj env);
+ScmObj ScmOp_multiply(ScmObj args, ScmObj env);
+ScmObj ScmOp_subtract(ScmObj args, ScmObj env);
 ScmObj ScmOp_divide(ScmObj args, ScmObj env);
 ScmObj ScmOp_numberp(ScmObj obj);
 ScmObj ScmOp_equal(ScmObj args, ScmObj env);