Further Bug Fixes

ThatOpen · Jul 8, 2023 · 50e23d3 · 50e23d3
1 parent cb948c6
commit 50e23d3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/wasm/geometry/IfcGeometryLoader.cpp b/src/wasm/geometry/IfcGeometryLoader.cpp
@@ -2972,10 +2972,10 @@ std::vector<IfcSegmentIndexSelect> IfcGeometryLoader::ReadCurveIndices() const
           _loader.StepBack();
           t = _loader.GetTokenType();
               // If you receive a real then add the real to the list
-          if (t == parsing::IfcTokenType::REAL)
+          if (t == parsing::IfcTokenType::INTEGER)
           {
             _loader.StepBack();
-            segment.indexs.push_back(static_cast<uint32_t>(_loader.GetDoubleArgument()));
+            segment.indexs.push_back(static_cast<uint32_t>(_loader.GetIntArgument()));
           }
         }
       }

diff --git a/src/wasm/geometry/IfcGeometryProcessor.cpp b/src/wasm/geometry/IfcGeometryProcessor.cpp
@@ -1584,9 +1584,9 @@ namespace webifc::geometry
         // while we have point set begin
         while (_loader.GetTokenType() == parsing::IfcTokenType::SET_BEGIN)
         {
-            result.push_back(_loader.GetIntArgument());
-            result.push_back(_loader.GetIntArgument());
-            result.push_back(_loader.GetIntArgument());
+            result.push_back((uint32_t)_loader.GetIntArgument());
+            result.push_back((uint32_t)_loader.GetIntArgument());
+            result.push_back((uint32_t)_loader.GetIntArgument());
 
             // read point set end
             _loader.GetTokenType();

diff --git a/src/wasm/parsing/IfcTokenChunk.cpp b/src/wasm/parsing/IfcTokenChunk.cpp
@@ -171,7 +171,7 @@ namespace webifc::parsing
           double value = number_value.first;
 
           if (negative) value *= -1;
-          if (number_value.second) {
+          if (!number_value.second) {
             Push<uint8_t>(IfcTokenType::INTEGER);
             Push<int>((int)value);
           } else {

diff --git a/src/wasm/parsing/number_parsing.cpp b/src/wasm/parsing/number_parsing.cpp
@@ -54,7 +54,7 @@ namespace webifc::parsing {
         ++num;
         break;
       } else {
-        return {sign * int_part,false};
+        return {sign * int_part,has_frac};
       }
       ++num;
     }
@@ -71,7 +71,7 @@ namespace webifc::parsing {
           ++num;
           break;
         } else {
-          return {sign * (int_part + frac_part),false};
+          return {sign * (int_part + frac_part),has_frac};
         }
         ++num;
       }