Merge remote-tracking branch 'origin/stable-2.0'

diff --cc libguile/foreign.c
Simple merge

diff --cc libguile/numbers.c
index 3cdc7fd,6f3a6ec..b5bce23
--- 1/libguile/numbers.c
--- 2/libguile/numbers.c
+++ b/libguile/numbers.c
@@@ -9194,9 -9184,17 +9195,17 @@@ SCM_PRIMITIVE_GENERIC (scm_numerator, "
    else if (SCM_FRACTIONP (z))
      return SCM_FRACTION_NUMERATOR (z);
    else if (SCM_REALP (z))
-     return scm_exact_to_inexact (scm_numerator (scm_inexact_to_exact (z)));
+     {
+       double zz = SCM_REAL_VALUE (z);
+       if (zz == floor (zz))
+         /* Handle -0.0 and infinities in accordance with R6RS
+            flnumerator, and optimize handling of integers. */
+         return z;
+       else
+         return scm_exact_to_inexact (scm_numerator (scm_inexact_to_exact (z)));
+     }
    else
 -    SCM_WTA_DISPATCH_1 (g_scm_numerator, z, SCM_ARG1, s_scm_numerator);
 +    return scm_wta_dispatch_1 (g_scm_numerator, z, SCM_ARG1, s_scm_numerator);
  }
  #undef FUNC_NAME
  
@@@ -9211,10 -9209,17 +9220,18 @@@ SCM_PRIMITIVE_GENERIC (scm_denominator
    else if (SCM_FRACTIONP (z))
      return SCM_FRACTION_DENOMINATOR (z);
    else if (SCM_REALP (z))
-     return scm_exact_to_inexact (scm_denominator (scm_inexact_to_exact (z)));
+     {
+       double zz = SCM_REAL_VALUE (z);
+       if (zz == floor (zz))
+         /* Handle infinities in accordance with R6RS fldenominator, and
+            optimize handling of integers. */
+         return scm_i_from_double (1.0);
+       else
+         return scm_exact_to_inexact (scm_denominator (scm_inexact_to_exact (z)));
+     }
    else
 -    SCM_WTA_DISPATCH_1 (g_scm_denominator, z, SCM_ARG1, s_scm_denominator);
 +    return scm_wta_dispatch_1 (g_scm_denominator, z, SCM_ARG1,
 +                               s_scm_denominator);
  }
  #undef FUNC_NAME
  

diff --cc libguile/print.c
Simple merge

diff --cc module/language/scheme/decompile-tree-il.scm
index 2decd97,fad857d..99edee4
--- 1/module/language/scheme/decompile-tree-il.scm
--- 2/module/language/scheme/decompile-tree-il.scm
+++ b/module/language/scheme/decompile-tree-il.scm
@@@ -686,11 -695,9 +686,11 @@@
               (primitive 'if)
               (recurse test) (recurse consequent) (recurse alternate))
  
 -            ((<sequence> exps) (primitive 'begin) (for-each recurse exps))
 +            ((<seq> head tail)
 +             (primitive 'begin) (recurse head) (recurse tail))
 +
              ((<lambda> body)
-              (if body (recurse body)))
+              (if body (recurse body) (primitive 'case-lambda)))
  
              ((<lambda-case> req opt rest kw inits gensyms body alternate)
               (primitive 'lambda)

diff --cc test-suite/tests/foreign.test
Simple merge