Fix parsing decimals

A number literal is a float if it contains ".", not if it is divisible
by 1. For example, 1.0 should be considered a float literal.

.gitlab-ci.yml

@@ -19,7 +19,7 @@ build:
     - ninja -C _build docs/en
     - git clone https://gitlab.gnome.org/jwestman/blueprint-regression-tests.git
     - cd blueprint-regression-tests
-    - git checkout 3077f669fc9c8e3ceb4da85e6bda680c297c58a2
+    - git checkout 9bfb9325d75a9985310230f119579f07df519e60
     - ./test.sh
     - cd ..
   coverage: '/TOTAL.*\s([.\d]+)%/'

blueprintcompiler/outputs/xml/__init__.py

@@ -192,6 +192,9 @@ class XmlOutput(OutputFormat):
                 xml.put_text(self._object_id(value, value.ident))
         elif isinstance(value, TypeLiteral):
             xml.put_text(value.type_name.glib_type_name)
+        else:
+            if isinstance(value.value, float) and value.value == int(value.value):
+                xml.put_text(int(value.value))
             else:
                 xml.put_text(value.value)
 

blueprintcompiler/parse_tree.py

@@ -520,8 +520,6 @@ class UseNumber(ParseNode):
             return False
 
         number = token.get_number()
-        if number % 1.0 == 0:
-            number = int(number)
         ctx.set_group_val(self.key, number, token)
         return True
 

blueprintcompiler/tokenizer.py

@@ -70,8 +70,10 @@ class Token:
         try:
             if string.startswith("0x"):
                 return int(string, 16)
-            else:
+            elif "." in string:
                 return float(string)
+            else:
+                return int(string)
         except:
             raise CompileError(
                 f"{str(self)} is not a valid number literal", self.start, self.end

tests/samples/issue_119.blp

@@ -0,0 +1,5 @@
+using Gtk 4.0;
+
+Adjustment {
+  value: bind 1.0 as <double>;
+}

tests/samples/issue_119.ui

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <object class="GtkAdjustment">
+    <binding name="value">
+      <constant type="gfloat">1</constant>
+    </binding>
+  </object>
+</interface>

tests/samples/numbers.blp

@@ -2,7 +2,7 @@ using Gtk 4.0;
 
 Gtk.Label {
   xalign: .5;
+  yalign: 0.0;
   height-request: 1_000_000;
   margin-top: 0x30;
-
 }

tests/samples/numbers.ui

@@ -3,6 +3,7 @@
   <requires lib="gtk" version="4.0"/>
   <object class="GtkLabel">
     <property name="xalign">0.5</property>
+    <property name="yalign">0</property>
     <property name="height-request">1000000</property>
     <property name="margin-top">48</property>
   </object>