Merge branch 'master' into filters.assign.create

PDAL · Dec 15, 2023 · 8c5cfe3 · 8c5cfe3
2 parents 9822a50 + b16edfd
commit 8c5cfe3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/doc/workshop/environment.yml b/doc/workshop/environment.yml
@@ -3,7 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - python=3.11
-  - pdal=2.5.6
+  - pdal=2.6.2
   - python-pdal
   - gdal
   - untwine

diff --git a/filters/private/expr/AssignParser.cpp b/filters/private/expr/AssignParser.cpp
@@ -48,7 +48,7 @@ bool AssignParser::where(AssignStatement& expr)
         std::string ident = Utils::toupper(curToken().sval());
         if (ident != "WHERE")
         {
-            setError("Expected keyword 'WHERE' to precede condition assignment.");
+            setError("Expected keyword 'WHERE'. Found identifier '" + curToken().sval() + "'.");
             return false;
         }
     }

diff --git a/filters/private/expr/AssignStatement.cpp b/filters/private/expr/AssignStatement.cpp
@@ -43,11 +43,11 @@ Utils::StatusWithReason AssignStatement::prepare(PointLayoutPtr layout)
 {
     auto status = m_identExpr.prepare(layout);
     if (!status)
-        return {-1, m_identExpr.error()};
+        return status;
 
     status = m_valueExpr.prepare(layout);
     if (!status)
-        return {-1, m_identExpr.error()};
+        return status;
 
     return m_conditionalExpr.prepare(layout);
 }

diff --git a/filters/private/expr/Lexer.cpp b/filters/private/expr/Lexer.cpp
@@ -128,7 +128,7 @@ Token Lexer::top(char c)
         tok = letter();
         break;
     default:
-        tok = Token(TokenType::Error, m_tokPos, m_pos, "Syntax error.");    
+        tok = Token(TokenType::Error, m_tokPos, m_pos, std::string(1, c));
         break;
     }
     return tok;
@@ -222,10 +222,10 @@ Token Lexer::letter()
         if (!std::isalnum(c) && c != '_')
         {
             putChar();
-            return Token(TokenType::Identifier, m_tokPos, m_pos, 
+            return Token(TokenType::Identifier, m_tokPos, m_pos,
                 m_buf.substr(m_tokPos, m_pos - m_tokPos));
         }
-    } 
+    }
 }
 
 } // namespace expr