taskjuggler 0.0.3 → 0.0.4

data/doc/classes/TaskJuggler/LogicalFunction.html

@@ -104,13 +104,13 @@ function call in a <a href="LogicalExpression.html">LogicalExpression</a>.
 
       <div class="name-list">
 
-        <a href="#M000991">eval</a>&nbsp;&nbsp;
+        <a href="#M001133">eval</a>&nbsp;&nbsp;
 
-        <a href="#M000989">new</a>&nbsp;&nbsp;
+        <a href="#M001131">new</a>&nbsp;&nbsp;
 
-        <a href="#M000990">setArgumentsAndCheck</a>&nbsp;&nbsp;
+        <a href="#M001132">setArgumentsAndCheck</a>&nbsp;&nbsp;
 
-        <a href="#M000992">to_s</a>&nbsp;&nbsp;
+        <a href="#M001134">to_s</a>&nbsp;&nbsp;
 
       </div>
     </div>
@@ -157,12 +157,12 @@ function call in a <a href="LogicalExpression.html">LogicalExpression</a>.
       <h3 class="section-bar">Public Class methods</h3>
 
 
-      <div id="method-M000989" class="method-detail">
-        <a name="M000989"></a>
+      <div id="method-M001131" class="method-detail">
+        <a name="M001131"></a>
 
         <div class="method-heading">
 
-          <a href="#M000989" class="method-signature">
+          <a href="#M001131" class="method-signature">
 
           <span class="method-name">new</span><span class="method-args">(opnd)</span>
 
@@ -178,14 +178,20 @@ Create a new <a href="LogicalFunction.html">LogicalFunction</a>.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000989-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000989-source">
+            onclick="toggleCode('M001131-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M001131-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/LogicalFunction.rb, line 34</span>
-34:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">opnd</span>)
-35:       <span class="ruby-ivar">@name</span> = <span class="ruby-identifier">opnd</span>
-36:       <span class="ruby-ivar">@arguments</span> = []
-37:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/LogicalFunction.rb, line 38</span>
+38:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">opnd</span>)
+39:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">opnd</span>[<span class="ruby-value">-1</span>] <span class="ruby-operator">==</span> <span class="ruby-value">?_</span>
+40:         <span class="ruby-ivar">@name</span> = <span class="ruby-identifier">opnd</span>[<span class="ruby-value">0</span><span class="ruby-operator">..</span><span class="ruby-value">-2</span>]
+41:         <span class="ruby-ivar">@invertProperties</span> = <span class="ruby-keyword kw">true</span>
+42:       <span class="ruby-keyword kw">else</span>
+43:         <span class="ruby-ivar">@name</span> = <span class="ruby-identifier">opnd</span>
+44:         <span class="ruby-ivar">@invertProperties</span> = <span class="ruby-keyword kw">false</span>
+45:       <span class="ruby-keyword kw">end</span>
+46:       <span class="ruby-ivar">@arguments</span> = []
+47:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -196,12 +202,12 @@ Create a new <a href="LogicalFunction.html">LogicalFunction</a>.
       <h3 class="section-bar">Public Instance methods</h3>
 
 
-      <div id="method-M000991" class="method-detail">
-        <a name="M000991"></a>
+      <div id="method-M001133" class="method-detail">
+        <a name="M001133"></a>
 
         <div class="method-heading">
 
-          <a href="#M000991" class="method-signature">
+          <a href="#M001133" class="method-signature">
 
           <span class="method-name">eval</span><span class="method-args">(expr)</span>
 
@@ -216,15 +222,20 @@ Evaluate the function by calling it with the arguments.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000991-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000991-source">
+            onclick="toggleCode('M001133-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M001133-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/LogicalFunction.rb, line 57</span>
-57:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>)
-58:       <span class="ruby-identifier">args</span> = []
-59:       <span class="ruby-comment cmt"># Call the function and return the result.</span>
-60:       <span class="ruby-identifier">send</span>(<span class="ruby-ivar">@name</span>, <span class="ruby-identifier">expr</span>, <span class="ruby-ivar">@arguments</span>)
-61:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/LogicalFunction.rb, line 67</span>
+67:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>)
+68:       <span class="ruby-identifier">args</span> = []
+69:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@invertProperties</span>
+70:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">expr</span>.<span class="ruby-identifier">query</span>.<span class="ruby-identifier">scopeProperty</span>
+71:         <span class="ruby-identifier">expr</span> = <span class="ruby-identifier">expr</span>.<span class="ruby-identifier">dup</span>
+72:         <span class="ruby-identifier">expr</span>.<span class="ruby-identifier">flipProperties</span>
+73:       <span class="ruby-keyword kw">end</span>
+74:       <span class="ruby-comment cmt"># Call the function and return the result.</span>
+75:       <span class="ruby-identifier">send</span>(<span class="ruby-identifier">name</span>, <span class="ruby-identifier">expr</span>, <span class="ruby-ivar">@arguments</span>)
+76:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -232,12 +243,12 @@ Evaluate the function by calling it with the arguments.
       </div>
 
 
-      <div id="method-M000990" class="method-detail">
-        <a name="M000990"></a>
+      <div id="method-M001132" class="method-detail">
+        <a name="M001132"></a>
 
         <div class="method-heading">
 
-          <a href="#M000990" class="method-signature">
+          <a href="#M001132" class="method-signature">
 
           <span class="method-name">setArgumentsAndCheck</span><span class="method-args">(args)</span>
 
@@ -254,23 +265,23 @@ function and the number of arguments match this function. If not, return an
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000990-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000990-source">
+            onclick="toggleCode('M001132-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M001132-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/LogicalFunction.rb, line 42</span>
-42:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">setArgumentsAndCheck</span>(<span class="ruby-identifier">args</span>)
-43:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@@functions</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-ivar">@name</span>)
-44:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'unknown_function'</span>,
-45:                  <span class="ruby-node">&quot;Unknown function #{@name} used in logical expression.&quot;</span> ]
-46:       <span class="ruby-keyword kw">end</span>
-47:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@@functions</span>[<span class="ruby-ivar">@name</span>] <span class="ruby-operator">!=</span> <span class="ruby-identifier">args</span>.<span class="ruby-identifier">length</span>
-48:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'wrong_no_func_arguments'</span>,
-49:                  <span class="ruby-node">&quot;Wrong number of arguments for function #{@name}. Got &quot;</span> <span class="ruby-operator">+</span>
-50:                  <span class="ruby-node">&quot;#{args.length} instead of #{@@functions[@name]}.&quot;</span> ]
-51:       <span class="ruby-keyword kw">end</span>
-52:       <span class="ruby-ivar">@arguments</span> = <span class="ruby-identifier">args</span>
-53:       <span class="ruby-keyword kw">nil</span>
-54:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/LogicalFunction.rb, line 52</span>
+52:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">setArgumentsAndCheck</span>(<span class="ruby-identifier">args</span>)
+53:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@@functions</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-ivar">@name</span>)
+54:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'unknown_function'</span>,
+55:                  <span class="ruby-node">&quot;Unknown function #{@name} used in logical expression.&quot;</span> ]
+56:       <span class="ruby-keyword kw">end</span>
+57:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@@functions</span>[<span class="ruby-ivar">@name</span>] <span class="ruby-operator">!=</span> <span class="ruby-identifier">args</span>.<span class="ruby-identifier">length</span>
+58:         <span class="ruby-keyword kw">return</span> [ <span class="ruby-value str">'wrong_no_func_arguments'</span>,
+59:                  <span class="ruby-node">&quot;Wrong number of arguments for function #{@name}. Got &quot;</span> <span class="ruby-operator">+</span>
+60:                  <span class="ruby-node">&quot;#{args.length} instead of #{@@functions[@name]}.&quot;</span> ]
+61:       <span class="ruby-keyword kw">end</span>
+62:       <span class="ruby-ivar">@arguments</span> = <span class="ruby-identifier">args</span>
+63:       <span class="ruby-keyword kw">nil</span>
+64:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -278,12 +289,12 @@ function and the number of arguments match this function. If not, return an
       </div>
 
 
-      <div id="method-M000992" class="method-detail">
-        <a name="M000992"></a>
+      <div id="method-M001134" class="method-detail">
+        <a name="M001134"></a>
 
         <div class="method-heading">
 
-          <a href="#M000992" class="method-signature">
+          <a href="#M001134" class="method-signature">
 
           <span class="method-name">to_s</span><span class="method-args">()</span>
 
@@ -298,13 +309,13 @@ Return a textual expression of the function call.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000992-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000992-source">
+            onclick="toggleCode('M001134-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M001134-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/LogicalFunction.rb, line 64</span>
-64:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_s</span>
-65:       <span class="ruby-node">&quot;#{@name}(#{@arguments.join(', ')})&quot;</span>
-66:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/LogicalFunction.rb, line 79</span>
+79:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_s</span>
+80:       <span class="ruby-node">&quot;#{@name}(#{@arguments.join(', ')})&quot;</span>
+81:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 

data/doc/classes/TaskJuggler/LogicalOperation.html

@@ -98,7 +98,7 @@ references to project data. The <a
 href="LogicalOperation.html">LogicalOperation</a> can be evaluated in a
 certain context. This contexts determines the actual values of the project
 data references. The evaluation is done by calling <a
-href="LogicalOperation.html#M000950">LogicalOperation#eval</a>. The result
+href="LogicalOperation.html#M000966">LogicalOperation#eval</a>. The result
 must be of a type that responds to all the operators that are used in the
 eval method.
 </p>
@@ -113,9 +113,11 @@ eval method.
 
       <div class="name-list">
 
-        <a href="#M000950">eval</a>&nbsp;&nbsp;
+        <a href="#M000966">eval</a>&nbsp;&nbsp;
 
-        <a href="#M000949">new</a>&nbsp;&nbsp;
+        <a href="#M000965">new</a>&nbsp;&nbsp;
+
+        <a href="#M000967">to_s</a>&nbsp;&nbsp;
 
       </div>
     </div>
@@ -170,12 +172,12 @@ eval method.
       <h3 class="section-bar">Public Class methods</h3>
 
 
-      <div id="method-M000949" class="method-detail">
-        <a name="M000949"></a>
+      <div id="method-M000965" class="method-detail">
+        <a name="M000965"></a>
 
         <div class="method-heading">
 
-          <a href="#M000949" class="method-signature">
+          <a href="#M000965" class="method-signature">
 
           <span class="method-name">new</span><span class="method-args">(opnd1, operator = nil, opnd2 = nil)</span>
 
@@ -192,8 +194,8 @@ can be set later.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000949-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000949-source">
+            onclick="toggleCode('M000965-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000965-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/LogicalOperation.rb, line 32</span>
 32:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">opnd1</span>, <span class="ruby-identifier">operator</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">opnd2</span> = <span class="ruby-keyword kw">nil</span>)
@@ -211,12 +213,12 @@ can be set later.
       <h3 class="section-bar">Public Instance methods</h3>
 
 
-      <div id="method-M000950" class="method-detail">
-        <a name="M000950"></a>
+      <div id="method-M000966" class="method-detail">
+        <a name="M000966"></a>
 
         <div class="method-heading">
 
-          <a href="#M000950" class="method-signature">
+          <a href="#M000966" class="method-signature">
 
           <span class="method-name">eval</span><span class="method-args">(expr)</span>
 
@@ -233,53 +235,99 @@ must be of a type that responds to all the operators of this function.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000950-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000950-source">
+            onclick="toggleCode('M000966-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000966-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/LogicalOperation.rb, line 41</span>
 41:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>)
-42:       <span class="ruby-keyword kw">begin</span>
-43:         <span class="ruby-keyword kw">case</span> <span class="ruby-ivar">@operator</span>
-44:         <span class="ruby-keyword kw">when</span> <span class="ruby-keyword kw">nil</span>
-45:           <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@operand1</span>.<span class="ruby-identifier">respond_to?</span>(<span class="ruby-identifier">:eval</span>)
-46:             <span class="ruby-comment cmt"># An operand can be a fixed value or another term. This could be a</span>
-47:             <span class="ruby-comment cmt"># LogicalOperation, LogicalFunction or anything else that provides</span>
-48:             <span class="ruby-comment cmt"># an appropriate eval() method.</span>
-49:             <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@operand1</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>)
-50:           <span class="ruby-keyword kw">else</span>
-51:             <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@operand1</span>
-52:           <span class="ruby-keyword kw">end</span>
-53:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'~'</span>
-54:           <span class="ruby-keyword kw">return</span> <span class="ruby-operator">!</span><span class="ruby-identifier">coerceBoolean</span>(<span class="ruby-ivar">@operand1</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>))
-55:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&gt;'</span>
-56:           <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">coerceNumber</span>(<span class="ruby-ivar">@operand1</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>)) <span class="ruby-operator">&gt;</span>
-57:                  <span class="ruby-identifier">coerceNumber</span>(<span class="ruby-ivar">@operand2</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>))
-58:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&gt;='</span>
-59:           <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">coerceNumber</span>(<span class="ruby-ivar">@operand1</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>)) <span class="ruby-operator">&gt;=</span>
-60:                  <span class="ruby-identifier">coerceNumber</span>(<span class="ruby-ivar">@operand2</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>))
-61:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'='</span>
-62:           <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">coerceNumber</span>(<span class="ruby-ivar">@operand1</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>)) <span class="ruby-operator">==</span>
-63:                  <span class="ruby-identifier">coerceNumber</span>(<span class="ruby-ivar">@operand2</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>))
-64:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&lt;'</span>
-65:           <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">coerceNumber</span>(<span class="ruby-ivar">@operand1</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>)) <span class="ruby-operator">&lt;</span>
-66:                  <span class="ruby-identifier">coerceNumber</span>(<span class="ruby-ivar">@operand2</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>))
-67:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&lt;='</span>
-68:           <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">coerceNumber</span>(<span class="ruby-ivar">@operand1</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>)) <span class="ruby-operator">&lt;=</span>
-69:                  <span class="ruby-identifier">coerceNumber</span>(<span class="ruby-ivar">@operand2</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>))
-70:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&amp;'</span>
-71:           <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">coerceBoolean</span>(<span class="ruby-ivar">@operand1</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>)) <span class="ruby-operator">&amp;&amp;</span>
-72:                  <span class="ruby-identifier">coerceBoolean</span>(<span class="ruby-ivar">@operand2</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>))
-73:         <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'|'</span>
-74:           <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">coerceBoolean</span>(<span class="ruby-ivar">@operand1</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>)) <span class="ruby-operator">||</span>
-75:                  <span class="ruby-identifier">coerceBoolean</span>(<span class="ruby-ivar">@operand2</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>))
-76:         <span class="ruby-keyword kw">else</span>
-77:           <span class="ruby-identifier">raise</span> <span class="ruby-constant">TjException</span>.<span class="ruby-identifier">new</span>,
-78:                 <span class="ruby-node">&quot;Unknown operator #{@operator} in logical expression&quot;</span>
-79:         <span class="ruby-keyword kw">end</span>
-80:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">TjException</span>
-81:         <span class="ruby-identifier">expr</span>.<span class="ruby-identifier">error</span> <span class="ruby-node">&quot;Can't evaluate #{to_s}&quot;</span>
-82:       <span class="ruby-keyword kw">end</span>
-83:     <span class="ruby-keyword kw">end</span>
+42:       <span class="ruby-keyword kw">case</span> <span class="ruby-ivar">@operator</span>
+43:       <span class="ruby-keyword kw">when</span> <span class="ruby-keyword kw">nil</span>
+44:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@operand1</span>.<span class="ruby-identifier">respond_to?</span>(<span class="ruby-identifier">:eval</span>)
+45:           <span class="ruby-comment cmt"># An operand can be a fixed value or another term. This could be a</span>
+46:           <span class="ruby-comment cmt"># LogicalOperation, LogicalFunction or anything else that provides</span>
+47:           <span class="ruby-comment cmt"># an appropriate eval() method.</span>
+48:           <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@operand1</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>)
+49:         <span class="ruby-keyword kw">else</span>
+50:           <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@operand1</span>
+51:         <span class="ruby-keyword kw">end</span>
+52:       <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'~'</span>
+53:         <span class="ruby-keyword kw">return</span> <span class="ruby-operator">!</span><span class="ruby-identifier">coerceBoolean</span>(<span class="ruby-ivar">@operand1</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>), <span class="ruby-identifier">expr</span>)
+54:       <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&gt;'</span>, <span class="ruby-value str">'&gt;='</span>, <span class="ruby-value str">'='</span>, <span class="ruby-value str">'&lt;'</span>, <span class="ruby-value str">'&lt;='</span>, <span class="ruby-value str">'!='</span>
+55:         <span class="ruby-comment cmt"># Evaluate the operation for all 2 operand operations that can be</span>
+56:         <span class="ruby-comment cmt"># either interpreted as date, numbers or Strings.</span>
+57:         <span class="ruby-identifier">opnd1</span> = <span class="ruby-ivar">@operand1</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>)
+58:         <span class="ruby-identifier">opnd2</span> = <span class="ruby-ivar">@operand2</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>)
+59:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">opnd1</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">TjTime</span>)
+60:           <span class="ruby-identifier">res</span>= <span class="ruby-identifier">evalBinaryOperation</span>(<span class="ruby-identifier">opnd1</span>, <span class="ruby-identifier">operator</span>, <span class="ruby-identifier">opnd2</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">o</span><span class="ruby-operator">|</span>
+61:             <span class="ruby-identifier">coerceTime</span>(<span class="ruby-identifier">o</span>, <span class="ruby-identifier">expr</span>)
+62:           <span class="ruby-keyword kw">end</span>
+63:           <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">res</span>
+64:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">opnd1</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Fixnum</span>) <span class="ruby-operator">||</span> <span class="ruby-identifier">opnd1</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Float</span>) <span class="ruby-operator">||</span> <span class="ruby-identifier">opnd1</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Bignum</span>)
+65:           <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">evalBinaryOperation</span>(<span class="ruby-identifier">opnd1</span>, <span class="ruby-identifier">operator</span>, <span class="ruby-identifier">opnd2</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">o</span><span class="ruby-operator">|</span>
+66:             <span class="ruby-identifier">coerceNumber</span>(<span class="ruby-identifier">o</span>, <span class="ruby-identifier">expr</span>)
+67:           <span class="ruby-keyword kw">end</span>
+68:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">opnd1</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">String</span>)
+69:           <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">evalBinaryOperation</span>(<span class="ruby-identifier">opnd1</span>, <span class="ruby-identifier">operator</span>, <span class="ruby-identifier">opnd2</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">o</span><span class="ruby-operator">|</span>
+70:             <span class="ruby-identifier">coerceString</span>(<span class="ruby-identifier">o</span>, <span class="ruby-identifier">expr</span>)
+71:           <span class="ruby-keyword kw">end</span>
+72:         <span class="ruby-keyword kw">else</span>
+73:           <span class="ruby-identifier">expr</span>.<span class="ruby-identifier">error</span>(<span class="ruby-value str">&quot;First operand of a binary operation must be a date, &quot;</span> <span class="ruby-operator">+</span>
+74:                      <span class="ruby-node">&quot;a number or a string: #{opnd1}&quot;</span>)
+75:         <span class="ruby-keyword kw">end</span>
+76:       <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'&amp;'</span>
+77:         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">coerceBoolean</span>(<span class="ruby-ivar">@operand1</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>), <span class="ruby-identifier">expr</span>) <span class="ruby-operator">&amp;&amp;</span>
+78:                <span class="ruby-identifier">coerceBoolean</span>(<span class="ruby-ivar">@operand2</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>), <span class="ruby-identifier">expr</span>)
+79:       <span class="ruby-keyword kw">when</span> <span class="ruby-value str">'|'</span>
+80:         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">coerceBoolean</span>(<span class="ruby-ivar">@operand1</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>), <span class="ruby-identifier">expr</span>) <span class="ruby-operator">||</span>
+81:                <span class="ruby-identifier">coerceBoolean</span>(<span class="ruby-ivar">@operand2</span>.<span class="ruby-identifier">eval</span>(<span class="ruby-identifier">expr</span>), <span class="ruby-identifier">expr</span>)
+82:       <span class="ruby-keyword kw">else</span>
+83:         <span class="ruby-identifier">expr</span>.<span class="ruby-identifier">error</span>(<span class="ruby-node">&quot;Unknown operator #{@operator} in logical expression&quot;</span>)
+84:       <span class="ruby-keyword kw">end</span>
+85:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+
+        </div>
+      </div>
+
+
+      <div id="method-M000967" class="method-detail">
+        <a name="M000967"></a>
+
+        <div class="method-heading">
+
+          <a href="#M000967" class="method-signature">
+
+          <span class="method-name">to_s</span><span class="method-args">()</span>
+
+          </a>
+
+        </div>
+
+        <div class="method-description">
+
+          <p>
+Convert the operation into a textual representation. This function is used
+for error reporting and debugging.
+</p>
+
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000967-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000967-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/LogicalOperation.rb, line 89</span>
+ 89:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_s</span>
+ 90:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@operator</span>.<span class="ruby-identifier">nil?</span>
+ 91:         <span class="ruby-node">&quot;#{@operand1.to_s}&quot;</span>
+ 92:       <span class="ruby-keyword kw">elsif</span> <span class="ruby-ivar">@operand2</span>.<span class="ruby-identifier">nil?</span>
+ 93:         <span class="ruby-node">&quot;#{@operator}(#{@operand1.is_a?(String) ?
+ 94:                        &quot;'&quot; + @operand1 + &quot;'&quot; : @operand1})&quot;</span>
+ 95:       <span class="ruby-keyword kw">else</span>
+ 96:         <span class="ruby-node">&quot;(#{@operand1.is_a?(String) ? &quot;'&quot; + @operand1 + &quot;'&quot; :
+ 97:                                             @operand1} #{@operator} #{
+ 98:             @operand2.is_a?(String) ? &quot;'&quot; + @operand2 + &quot;'&quot; : @operand2})&quot;</span>
+ 99:       <span class="ruby-keyword kw">end</span>
+100:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 

data/doc/classes/TaskJuggler/Macro.html

@@ -95,7 +95,7 @@
 
       <div class="name-list">
 
-        <a href="#M000527">new</a>&nbsp;&nbsp;
+        <a href="#M000713">new</a>&nbsp;&nbsp;
 
       </div>
     </div>
@@ -150,12 +150,12 @@
       <h3 class="section-bar">Public Class methods</h3>
 
 
-      <div id="method-M000527" class="method-detail">
-        <a name="M000527"></a>
+      <div id="method-M000713" class="method-detail">
+        <a name="M000713"></a>
 
         <div class="method-heading">
 
-          <a href="#M000527" class="method-signature">
+          <a href="#M000713" class="method-signature">
 
           <span class="method-name">new</span><span class="method-args">(name, value, sourceFileInfo)</span>
 
@@ -166,8 +166,8 @@
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000527-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000527-source">
+            onclick="toggleCode('M000713-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000713-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/MacroTable.rb, line 24</span>
 24:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">name</span>, <span class="ruby-identifier">value</span>, <span class="ruby-identifier">sourceFileInfo</span>)

data/doc/classes/TaskJuggler/MacroParser.html

@@ -103,17 +103,17 @@ from the same scanner that it uses to read the macro tokens.
 
       <div class="name-list">
 
-        <a href="#M000376">new</a>&nbsp;&nbsp;
+        <a href="#M000958">new</a>&nbsp;&nbsp;
 
-        <a href="#M000377">nextToken</a>&nbsp;&nbsp;
+        <a href="#M000959">nextToken</a>&nbsp;&nbsp;
 
-        <a href="#M000378">returnToken</a>&nbsp;&nbsp;
+        <a href="#M000960">returnToken</a>&nbsp;&nbsp;
 
-        <a href="#M000379">rule_macroArguments</a>&nbsp;&nbsp;
+        <a href="#M000961">rule_macroArguments</a>&nbsp;&nbsp;
 
-        <a href="#M000380">rule_macroCall</a>&nbsp;&nbsp;
+        <a href="#M000962">rule_macroCall</a>&nbsp;&nbsp;
 
-        <a href="#M000381">rule_relax</a>&nbsp;&nbsp;
+        <a href="#M000963">rule_relax</a>&nbsp;&nbsp;
 
       </div>
     </div>
@@ -134,12 +134,12 @@ from the same scanner that it uses to read the macro tokens.
       <h3 class="section-bar">Public Class methods</h3>
 
 
-      <div id="method-M000376" class="method-detail">
-        <a name="M000376"></a>
+      <div id="method-M000958" class="method-detail">
+        <a name="M000958"></a>
 
         <div class="method-heading">
 
-          <a href="#M000376" class="method-signature">
+          <a href="#M000958" class="method-signature">
 
           <span class="method-name">new</span><span class="method-args">(scanner, messageHandler)</span>
 
@@ -150,8 +150,8 @@ from the same scanner that it uses to read the macro tokens.
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000376-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000376-source">
+            onclick="toggleCode('M000958-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000958-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/MacroParser.rb, line 23</span>
 23:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">scanner</span>, <span class="ruby-identifier">messageHandler</span>)
@@ -173,12 +173,12 @@ from the same scanner that it uses to read the macro tokens.
       <h3 class="section-bar">Public Instance methods</h3>
 
 
-      <div id="method-M000377" class="method-detail">
-        <a name="M000377"></a>
+      <div id="method-M000959" class="method-detail">
+        <a name="M000959"></a>
 
         <div class="method-heading">
 
-          <a href="#M000377" class="method-signature">
+          <a href="#M000959" class="method-signature">
 
           <span class="method-name">nextToken</span><span class="method-args">()</span>
 
@@ -189,8 +189,8 @@ from the same scanner that it uses to read the macro tokens.
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000377-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000377-source">
+            onclick="toggleCode('M000959-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000959-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/MacroParser.rb, line 33</span>
 33:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">nextToken</span>
@@ -203,12 +203,12 @@ from the same scanner that it uses to read the macro tokens.
       </div>
 
 
-      <div id="method-M000378" class="method-detail">
-        <a name="M000378"></a>
+      <div id="method-M000960" class="method-detail">
+        <a name="M000960"></a>
 
         <div class="method-heading">
 
-          <a href="#M000378" class="method-signature">
+          <a href="#M000960" class="method-signature">
 
           <span class="method-name">returnToken</span><span class="method-args">(token)</span>
 
@@ -219,8 +219,8 @@ from the same scanner that it uses to read the macro tokens.
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000378-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000378-source">
+            onclick="toggleCode('M000960-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000960-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/MacroParser.rb, line 37</span>
 37:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">returnToken</span>(<span class="ruby-identifier">token</span>)
@@ -233,12 +233,12 @@ from the same scanner that it uses to read the macro tokens.
       </div>
 
 
-      <div id="method-M000379" class="method-detail">
-        <a name="M000379"></a>
+      <div id="method-M000961" class="method-detail">
+        <a name="M000961"></a>
 
         <div class="method-heading">
 
-          <a href="#M000379" class="method-signature">
+          <a href="#M000961" class="method-signature">
 
           <span class="method-name">rule_macroArguments</span><span class="method-args">()</span>
 
@@ -249,8 +249,8 @@ from the same scanner that it uses to read the macro tokens.
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000379-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000379-source">
+            onclick="toggleCode('M000961-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000961-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/MacroParser.rb, line 41</span>
 41:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">rule_macroArguments</span>
@@ -267,12 +267,12 @@ from the same scanner that it uses to read the macro tokens.
       </div>
 
 
-      <div id="method-M000380" class="method-detail">
-        <a name="M000380"></a>
+      <div id="method-M000962" class="method-detail">
+        <a name="M000962"></a>
 
         <div class="method-heading">
 
-          <a href="#M000380" class="method-signature">
+          <a href="#M000962" class="method-signature">
 
           <span class="method-name">rule_macroCall</span><span class="method-args">()</span>
 
@@ -283,8 +283,8 @@ from the same scanner that it uses to read the macro tokens.
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000380-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000380-source">
+            onclick="toggleCode('M000962-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000962-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/MacroParser.rb, line 49</span>
 49:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">rule_macroCall</span>
@@ -311,12 +311,12 @@ from the same scanner that it uses to read the macro tokens.
       </div>
 
 
-      <div id="method-M000381" class="method-detail">
-        <a name="M000381"></a>
+      <div id="method-M000963" class="method-detail">
+        <a name="M000963"></a>
 
         <div class="method-heading">
 
-          <a href="#M000381" class="method-signature">
+          <a href="#M000963" class="method-signature">
 
           <span class="method-name">rule_relax</span><span class="method-args">()</span>
 
@@ -327,8 +327,8 @@ from the same scanner that it uses to read the macro tokens.
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000381-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000381-source">
+            onclick="toggleCode('M000963-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000963-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/MacroParser.rb, line 67</span>
 67:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">rule_relax</span>