Changeset 2217

Timestamp:

Dec 31, 2006, 12:44:38 AM (14 years ago)

Author:

yura

Message:

Was error with '-0.1'. But still error in Refal with eIn1 in
QFromString \{

eIn1 '.' eIn2 =
{eIn1 : /*empty*/, '0'; eIn1;} :: eIn1,

...
eIn1 is '0' in any case.

Location:

to-imperative/trunk/samples/Rational

Files:

• Rational.rf (modified) (2 diffs)
• test.out (modified) (1 diff)
• test.rf (modified) (1 diff)

to-imperative/trunk/samples/Rational/Rational.rf

@@ -5 +5 @@
 $use Convert;
 $use Compare;
-$use StdIO;
 
 $func QSimplify s s = t;
@@ -53 +52 @@
 
 QFromString \{
-  eIn1 '.' eIn2 = <WriteLN eIn1 <Length eIn1>>,
-  {eIn1 : /*empty*/, <PrintLN "!"> '0'; eIn1;} :: eIn1,
+  eIn1 '.' eIn2 =
+  {eIn1 : /*empty*/, '0'; eIn1;} :: eIn1,
   <Length eIn2> 1
   $iter <"-" sN 1> <"*" sM 10> :: 
   sN sM, sN : 0 =
-  <QAdd <To-Int eIn1> <QDiv <To-Int eIn2> sM>>;
+  \{
+    eIn1 : e '-' e = <QSub <To-Int eIn1> <QDiv <To-Int eIn2> sM>>;
+    <QAdd <To-Int eIn1> <QDiv <To-Int eIn2> sM>>;
+  };
 
   /*empty*/ = (0 1);

to-imperative/trunk/samples/Rational/test.out

@@ -2 +2 @@
 (0 1)
 (0 1)
-(0 1)
+(10 1)
 (1 10)
 (1 10)
+(0 1)
+(-10 1)
+(-1 10)
 0
 0.3
 0.3333333333
+-2
+-2.3
+-2.3333333333
 0
 0.2
 0.25
+-1
+-1.7
+-1.75

to-imperative/trunk/samples/Rational/test.rf

@@ -11 +11 @@
   <WriteLN <QFromString '0.10'>>,
   <WriteLN <QFromString '.10'>>,
+  <WriteLN <QFromString '-0.0'>>,
+  <WriteLN <QFromString '-10.00'>>,
+  <WriteLN <QFromString '-0.10'>>,
   <PrintLN <QToString 0 (1 3)>>,
   <PrintLN <QToString 1 (1 3)>>,
   <PrintLN <QToString 10 (1 3)>>,
+  <PrintLN <QToString 0 (-7 3)>>,
+  <PrintLN <QToString 1 (-7 3)>>,
+  <PrintLN <QToString 10 (-7 3)>>,
   <PrintLN <QToString 0 (1 4)>>,
   <PrintLN <QToString 1 (1 4)>>,
-  <PrintLN <QToString 10 (1 4)>>;
+  <PrintLN <QToString 10 (1 4)>>,
+  <PrintLN <QToString 0 (-7 4)>>,
+  <PrintLN <QToString 1 (-7 4)>>,
+  <PrintLN <QToString 10 (-7 4)>>;