Add floating point literal scientific notation without dot "." (#57)

* Add float scientific notation without dot * Add tests for BigFloat and Hex number types
glojurelang · Nov 7, 2023 · 39017ef · 39017ef
1 parent 646b6e0
commit 39017ef
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 5 deletions.
diff --git a/pkg/reader/reader.go b/pkg/reader/reader.go
@@ -1014,9 +1014,10 @@ func (r *Reader) readSymbolicValue() (interface{}, error) {
 var (
 	numPrefixRegex = regexp.MustCompile(`^[-+]?([0-9]+|[1-9]+r)`)
 	radixRegex     = regexp.MustCompile(`^[-+]?([1-9]+)r(\d(\d|[a-zA-Z])*N?)$`)
-	intRegex       = regexp.MustCompile(`^[-+]?\d(\d|[a-fA-F])*N?$`)
+	intRegex       = regexp.MustCompile(`^[-+]?\d+N?$`)
 	ratioRegex     = regexp.MustCompile(`^[-+]?\d+\/\d+$`)
 	hexRegex       = regexp.MustCompile(`^[-+]?0[xX]([a-fA-F]|\d)*N?$`)
+	floatRegex     = regexp.MustCompile(`^[-+]?(\d+\.\d*|\.\d+)([eE][-+]?\d+)?|[-+]?(\d+)([eE][-+]?\d+)$`)
 )
 
 func isValidNumberCharacter(rn rune) bool {
@@ -1110,12 +1111,17 @@ func (r *Reader) readNumber(numStr string) (interface{}, error) {
 		return bd, nil
 	}
 
-	num, err := strconv.ParseFloat(numStr, 64)
-	if err != nil {
-		return nil, r.error("invalid number: %s", numStr)
+	if floatRegex.MatchString(numStr) {
+		num, err := strconv.ParseFloat(numStr, 64)
+		if err != nil {
+			return nil, r.error("invalid number: %s", numStr)
+		}
+
+		return num, nil
 	}
 
-	return num, nil
+	return nil, r.error("invalid number: %s", numStr)
+
 }
 
 func (r *Reader) readSymbol() (ret interface{}, retErr error) {

diff --git a/pkg/reader/testdata/reader/bigfloat00.glj b/pkg/reader/testdata/reader/bigfloat00.glj
@@ -1 +1,2 @@
 0M
+2.0M
diff --git a/pkg/reader/testdata/reader/bigfloat00.out b/pkg/reader/testdata/reader/bigfloat00.out
@@ -1 +1,2 @@
 0M
+2M
diff --git a/pkg/reader/testdata/reader/float00.glj b/pkg/reader/testdata/reader/float00.glj
@@ -0,0 +1,4 @@
+1E10
+12E3
+12E-3
+1.35e-12
diff --git a/pkg/reader/testdata/reader/float00.out b/pkg/reader/testdata/reader/float00.out
@@ -0,0 +1,4 @@
+10000000000.0
+12000.0
+0.012
+0.00000000000135
diff --git a/pkg/reader/testdata/reader/hex00.glj b/pkg/reader/testdata/reader/hex00.glj
@@ -0,0 +1,2 @@
+0x123
+010
diff --git a/pkg/reader/testdata/reader/hex00.out b/pkg/reader/testdata/reader/hex00.out
@@ -0,0 +1,2 @@
+291
+8