Remove support for float literals starting with a period

Before this patch, writing .0 instead of 0.0 was allowed, as in C, C++, D, Java, Go, Perl, Python and many other languages. This required a hack in the form of an additional entry pointer for our scanner. We now get rid of it, matching languages like Ada, Haskell, OCaml, Rust, Swift.
gap-system · Mar 26, 2019 · b79076a · b79076a
1 parent bf9bec2
commit b79076a
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 77 deletions.
diff --git a/src/read.c b/src/read.c
@@ -1402,8 +1402,10 @@ static void ReadFuncExprAbbrevSingle(TypSymbolSet follow)
 **  all symbols up to one contained in <follow>.
 **
 **  <Literal> := <Int>
+**            |  <Float>
 **            |  'true'
 **            |  'false'
+**            |  '~'
 **            |  <Char>
 **            |  <Perm>
 **            |  <String>
@@ -1421,13 +1423,6 @@ static void ReadLiteral (
     TypSymbolSet        follow,
     Char mode)
 {
-    if (STATE(Symbol) == S_DOT) {
-        // HACK: The only way a dot could turn up here is in a floating point
-        // literal that starts with '.'. Call back to the scanner to deal
-        // with this.
-        ScanForFloatAfterDotHACK();
-    }
-
     switch (STATE(Symbol)) {
 
     /* <Int>                                                               */
@@ -1470,7 +1465,7 @@ static void ReadLiteral (
         Match( S_CHAR, "character", follow );
         break;
 
-    /* string */
+    /* <String>                                                            */
     case S_STRING:
         GAP_ASSERT(STATE(ValueObj) != 0);
         TRY_IF_NO_ERROR { IntrStringExpr(STATE(ValueObj)); }
@@ -1483,7 +1478,7 @@ static void ReadLiteral (
         ReadListExpr( follow );
         break;
 
-    /* <Rec>                                                               */
+    /* <Record>                                                            */
     case S_REC:
         ReadRecExpr( follow );
         break;

diff --git a/src/scanner.c b/src/scanner.c
@@ -361,10 +361,6 @@ static UInt GetIdent(Int i)
 **
 **  When 'STATE(Value)' is completely filled, then a GAP string object is
 **  created in 'STATE(ValueObj)' and all data is stored there.
-**
-**  The argument is used to signal if a decimal point was already read,
-**  or whether we are starting from scratch..
-**
 */
 static UInt AddCharToBuf(Obj * string, Char * buf, UInt bufsize, UInt pos, Char c)
 {
@@ -381,26 +377,22 @@ static UInt AddCharToValue(UInt pos, Char c)
     return AddCharToBuf(&STATE(ValueObj), STATE(Value), MAX_VALUE_LEN - 1, pos, c);
 }
 
-static UInt GetNumber(Int readDecimalPoint)
+static UInt GetNumber(void)
 {
   UInt symbol = S_ILLEGAL;
   UInt i = 0;
   Char c;
-  UInt seenADigit = 0;
   UInt seenExp = 0;
   UInt seenExpDigit = 0;
 
   STATE(ValueObj) = 0;
 
   c = PEEK_CURR_CHAR();
-  if (readDecimalPoint) {
-    STATE(Value)[i++] = '.';
-  }
-  else {
+  GAP_ASSERT(IsDigit(c));
+
     // read initial sequence of digits into 'Value'
     while (IsDigit(c)) {
       i = AddCharToValue(i, c);
-      seenADigit = 1;
       c = GET_NEXT_CHAR();
     }
 
@@ -449,21 +441,15 @@ static UInt GetNumber(Int readDecimalPoint)
       symbol = S_INT;
       goto finish;
     }
-  }
 
 
-  // When we get here we have read possibly some digits, a . and possibly
-  // some more digits, but not an e,E,d,D,q or Q
+  // When we get here we have read some digits and a dot
 
-    // read digits
+    // read digits after dot
     while (IsDigit(c)) {
       i = AddCharToValue(i, c);
-      seenADigit = 1;
       c = GET_NEXT_CHAR();
     }
-    if (!seenADigit)
-      SyntaxError("Badly formed number: need a digit before or after the "
-                  "decimal point");
     if (c == '\\')
       SyntaxError("Badly formed number");
 
@@ -503,9 +489,6 @@ static UInt GetNumber(Int readDecimalPoint)
     // If the next thing is the start of the exponential notation, read it now.
 
     if (IsAlpha(c)) {
-      if (!seenADigit)
-        SyntaxError("Badly formed number: need a digit before or after "
-                    "the decimal point");
       seenExp = 1;
       i = AddCharToValue(i, c);
       c = GET_NEXT_CHAR();
@@ -518,9 +501,6 @@ static UInt GetNumber(Int readDecimalPoint)
     // Either we saw an exponent indicator, or we hit end of token deal with
     // the end of token case
     if (!seenExp) {
-      if (!seenADigit)
-        SyntaxError("Badly formed number: need a digit before or after "
-                    "the decimal point");
       // Might be a conversion marker
       if (IsAlpha(c) && c != 'e' && c != 'E' && c != 'd' && c != 'D' &&
           c != 'q' && c != 'Q') {
@@ -594,17 +574,6 @@ static UInt GetNumber(Int readDecimalPoint)
 }
 
 
-/****************************************************************************
-**
-*F  ScanForFloatAfterDotHACK()
-**
-*/
-void ScanForFloatAfterDotHACK(void)
-{
-    STATE(Symbol) = GetNumber(1);
-}
-
-
 /****************************************************************************
 **
 *F  GetOctalDigits()
@@ -1014,7 +983,7 @@ static UInt NextSymbol(void)
 
     case '0': case '1': case '2': case '3': case '4':
     case '5': case '6': case '7': case '8': case '9':
-                      return GetNumber(0);
+                      return GetNumber();
 
     case '\377':      symbol = S_EOF;           *STATE(In) = '\0'; break;
 

diff --git a/src/scanner.h b/src/scanner.h
@@ -344,18 +344,6 @@ EXPORT_INLINE void SyntaxWarning(const Char * msg)
 void Match(UInt symbol, const Char * msg, TypSymbolSet skipto);
 
 
-/****************************************************************************
-**
-*F  ScanForFloatAfterDotHACK()
-**
-**  This function is called by 'ReadLiteral' if it encounters a single dot in
-**  form the of the symbol 'S_DOT'. The only legal way this could happen is
-**  if the dot is the start of a float literal like '.123'. As the scanner
-**  cannot detect this without being context aware, we must provide this
-**  function to allow the reader to signal to the scanner about this.
-*/
-void ScanForFloatAfterDotHACK(void);
-
 /****************************************************************************
 **
 *F * * * * * * * * * * * * * initialize module * * * * * * * * * * * * * * *

diff --git a/tst/testbugfix/2013-08-21-t00295.tst b/tst/testbugfix/2013-08-21-t00295.tst
@@ -1,8 +1,7 @@
 # 2013/08/21 (MH)
 gap> . . . .
-Syntax error: Badly formed number: need a digit before or after the decimal po\
-int in stream:1
+Syntax error: literal expected in stream:1
 . . . .
 ^
-Syntax error: Record component name expected in stream:2
+Syntax error: ; expected in stream:2
 
diff --git a/tst/testinstall/float.tst b/tst/testinstall/float.tst
@@ -696,7 +696,7 @@ gap> ComplexConjugate(1.3);
 #
 gap> Display(1.3);
 1.3
-gap> Display(-.4e6);
+gap> Display(-0.4e6);
 -400000.
 gap> PrintObj(1.3); Print("Q\n");
 1.3Q

diff --git a/tst/testinstall/longnumber.tst b/tst/testinstall/longnumber.tst
@@ -152,40 +152,35 @@ gap> 1.;
 1.
 gap> 0.;
 0.
-gap> .1;
-0.1
 gap> 0.1;
 0.1
 gap> 1111111111111111111111111111111111111.1;
 1.11111e+36
 gap> 1.11111111111111111111111111111111111111;
 1.11111
 gap> .;
-Syntax error: Badly formed number: need a digit before or after the decimal po\
-int in stream:1
+Syntax error: literal expected in stream:1
 .;
 ^
 gap> .n;
-Syntax error: Badly formed number: need a digit before or after the decimal po\
-int in stream:1
+Syntax error: literal expected in stream:1
 .n;
 ^
 gap> .q;
-Syntax error: Badly formed number: need a digit before or after the decimal po\
-int in stream:1
+Syntax error: literal expected in stream:1
 .q;
 ^
 gap> .0n;
-Error, failed to convert float literal
+Syntax error: literal expected in stream:1
+.0n;
+^
 gap> .0q;
-Syntax error: Badly formed number: need at least one digit in the exponent in \
-stream:1
+Syntax error: literal expected in stream:1
 .0q;
-^^^
+^
 gap> .0qn;
-Syntax error: Badly formed number: need at least one digit in the exponent in \
-stream:1
+Syntax error: literal expected in stream:1
 .0qn;
-^^^
+^
 gap> Unbind(x);
 gap> STOP_TEST( "longnumber.tst", 1);