abiosoft / gocalc Goto Github PK

Hello,

According to the go language specification, and my compiler, float does not exist, only float32 and float64. Here is a patch that makes this project compile on my computer (64-bit Arch Linux).

Best regards,
Alexander Rødseth

(crated with git diff)

diff --git a/Makefile b/Makefile
index 9cc86c4..04355f3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-include $(GOROOT)/src/Make.$(GOARCH)
+include $(GOROOT)/src/Make.inc
 
 TARG=calculator
 GOFILES=\
    calculator.go\
    gui.go\
 
-include $(GOROOT)/src/Make.cmd
\ No newline at end of file
+include $(GOROOT)/src/Make.cmd
diff --git a/calculator.go b/calculator.go
index 15bbf0f..702ff4b 100644
--- a/calculator.go
+++ b/calculator.go
@@ -6,12 +6,12 @@ import (
 
 //Result
 var Result struct {
-   last     float  //stores last result
+   last     float32  //stores last result
    operator string //the next operator to use
    active   bool   //whether calculation has started
 }
 //perform calculation
-func calculation(val float, operator string) {
+func calculation(val float32, operator string) {
    if !Result.active {
        Result.last = val
        Result.operator = operator
diff --git a/gui.go b/gui.go
index 6d1879f..ebc5cf9 100644
--- a/gui.go
+++ b/gui.go
@@ -22,7 +22,7 @@ func quit() {
 func input(b *gtk.GtkButton) func() {
    return func(){
        if strings.Index(operators, b.GetLabel()) != -1 {
-           val, _ := strconv.Atof(screen.GetText())
+           val, _ := strconv.Atof32(screen.GetText())
            calculation(val, b.GetLabel())
            screen.SetText(getResult())
            inputMode = false