[ViewVC] Diff of: cvs/cvsroot/microscheme/scheme.c

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.40 by root, Mon Nov 30 05:19:01 2015 UTC vs.
Revision 1.42 by root, Mon Nov 30 06:19:18 2015 UTC

 INTERFACE pointer
 gensym (SCHEME_P)
 {
   pointer x;
   char name[40] = "gensym-";
-  xnum (name + 7, SCHEME_V->gensym_cnt);
+  xnum (name + 7, ++SCHEME_V->gensym_cnt);
   return generate_symbol (SCHEME_A_ name);
 }
 /* make symbol or number atom from string */
   int c, curr_line = 0;
   do
     {
       c = inchar (SCHEME_A);
 #if SHOW_ERROR_LINE
-      if (c == '\n')
+      if (ecb_expect_false (c == '\n'))
         curr_line++;
 #endif
+      if (ecb_expect_false (c == EOF))
+        return c;
     }
   while (is_one_of (WHITESPACE, c));
   /* record it */
 #if SHOW_ERROR_LINE
   if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
     SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
 #endif
-  if (c != EOF)
-    {
-      backchar (SCHEME_A_ c);
+  backchar (SCHEME_A_ c);
-      return 1;
+  return 1;
-    }
-  else
-    return EOF;
 }
 /* get token */
 static int
 token (SCHEME_P)

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines