[openoffice] branch scons-build updated: Improve logging for errors in gotoSCons.

[damjan]

This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch scons-build
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/scons-build by this push:
     new f15ade3  Improve logging for errors in gotoSCons.
f15ade3 is described below

commit f15ade382b4b0384ec802d0f943f82c9a594a68f
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Mon Jul 6 08:18:54 2020 +0200

    Improve logging for errors in gotoSCons.
    
    Patch by: me
---
 .../main/java/org/apache/openoffice/gotoSCons/raw/FunctionNode.java   | 2 +-
 .../src/main/java/org/apache/openoffice/gotoSCons/raw/ListNode.java   | 4 +++-
 .../main/java/org/apache/openoffice/gotoSCons/targets/BaseTarget.java | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/raw/FunctionNode.java 
b/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/raw/FunctionNode.java
index 792ea92..02ab6fd 100644
--- 
a/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/raw/FunctionNode.java
+++ 
b/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/raw/FunctionNode.java
@@ -38,6 +38,6 @@ public class FunctionNode extends Node {
 
     @Override
     public String toString() {
-        return function + "(...)";
+        return function + "(" + child.toString() + ")";
     }
 }
diff --git 
a/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/raw/ListNode.java 
b/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/raw/ListNode.java
index 8a6c26b..8eef65b 100644
--- a/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/raw/ListNode.java
+++ b/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/raw/ListNode.java
@@ -21,6 +21,8 @@
 
 package org.apache.openoffice.gotoSCons.raw;
 
+import java.util.Arrays;
+
 public class ListNode extends Node {
     public Node[] children;
     
@@ -38,6 +40,6 @@ public class ListNode extends Node {
 
     @Override
     public String toString() {
-        return children.toString();
+        return Arrays.toString(children);
     }
 }
diff --git 
a/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/targets/BaseTarget.java
 
b/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/targets/BaseTarget.java
index 157eefd..72a1e06 100644
--- 
a/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/targets/BaseTarget.java
+++ 
b/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/targets/BaseTarget.java
@@ -35,7 +35,7 @@ public abstract class BaseTarget {
                 if (functionNode.function.equals("eval")) {
                     parseEval(functionNode);
                 } else {
-                    throw new Exception("Top-level function isn't \"eval\" but 
\"" + functionNode.function + "\"");
+                    throw new Exception("Top-level function isn't \"eval\" but 
\"" + functionNode.function + "\", full node: " + child.toString());
                 }
             } else if (child instanceof ValueNode && 
((ValueNode)child).toString().equals("ifneq ($(OOO_JUNIT_JAR),)")) {
             } else if (child instanceof ValueNode && 
((ValueNode)child).toString().equals("ifeq ($(ENABLE_UNIT_TESTS),YES)")) {