taskjuggler 0.0.2 → 0.0.3

data/lib/TextScanner.rb

@@ -71,13 +71,21 @@ class TaskJuggler
       def getc19
         Log.activity if @bytes & 0x3FFF == 0
         @bytes += 1
-        @file.getc
+        begin
+          @file.getc
+        rescue
+          nil
+        end
       end
 
       def getc18
         Log.activity if @bytes & 0x3FFF == 0
         @bytes += 1
-        c = @file.getc
+        begin
+          c = @file.getc
+        rescue
+          return nil
+        end
         return nil if c.nil?
         '' << c
       end
@@ -165,7 +173,7 @@ class TaskJuggler
         end
       end
       @masterPath = @cf.dirname + '/'
-      @tokenBuffer = @pos = nil
+      @tokenBuffer = @pos = @lastPos = nil
     end
 
     # Finish processing and reset all data structures.
@@ -173,27 +181,39 @@ class TaskJuggler
       Log.startProgressMeter("Reading file #{@masterFile}")
       Log.stopProgressMeter
       @fileStack = []
-      @cf = @tokenBuffer = @pos = nil
+      @cf = @tokenBuffer = nil
     end
 
     # Continue processing with a new file specified by _fileName_. When this
     # file is finished, we will continue in the old file after the location
     # where we started with the new file.
     def include(fileName)
-      begin
-        if @fileStack.empty?
-          path = @masterPath
-        else
-          path = @fileStack.last[0].dirname + '/'
-          @fileStack.last[1, 2] = [ @tokenBuffer, @pos ]
-        end
-        if fileName[0] != '/'
-          # If the included file is not an absolute name, we interpret the file
-          # name relative to the including file.
-          fileName = path + fileName
-        end
+      if @fileStack.empty?
+        path = @masterPath
+      else
+        path = @fileStack.last[0].dirname + '/'
+        @fileStack.last[1, 2] = [ @tokenBuffer, @pos ]
+      end
+      if fileName[0] != '/'
+        # If the included file is not an absolute name, we interpret the file
+        # name relative to the including file.
+        fileName = path + fileName
+      end
+
+      @tokenBuffer = nil
 
-        @tokenBuffer = @pos = nil
+      # Check the current file stack to find recusions.
+      if @pos && fileName == @pos.fileName
+        error('include_recursion', "Recursive inclusion of #{fileName} detected")
+      else
+        @fileStack.each do |entry|
+          if fileName == entry[0].fileName
+            error('include_recursion', "Recursive inclusion of #{fileName} " +
+                  "detected")
+          end
+        end
+      end
+      begin
         @fileStack << [ (@cf = FileStreamHandle.new(fileName)), nil, nil ]
       rescue StandardError
         error('bad_include', "Cannot open include file #{fileName}")
@@ -229,11 +249,13 @@ class TaskJuggler
       # If we have a pushed-back token, return that first.
       unless @tokenBuffer.nil?
         res = @tokenBuffer
-        @tokenBuffer = @pos = nil
+        @tokenBuffer = nil
+        @pos = @tokenBufferPos
         return res
       end
 
       # Start processing characters from the input.
+      startOfToken = SourceFileInfo.new(fileName, lineNo, columnNo)
       token = [ '.', '<END>' ]
       while c = nextChar
         case c
@@ -242,10 +264,13 @@ class TaskJuggler
             token = tok
             break
           end
+          startOfToken = SourceFileInfo.new(fileName, lineNo, columnNo)
         when '#'
           skipComment
+          startOfToken = SourceFileInfo.new(fileName, lineNo, columnNo)
         when '/'
           skipCPlusPlusComments
+          startOfToken = SourceFileInfo.new(fileName, lineNo, columnNo)
         when '0'..'9'
           token = readNumber(c)
           break
@@ -255,12 +280,18 @@ class TaskJuggler
         when '"'
           token = readString(c)
           break
+        when '-'
+          token = handleDash
+          break
         when '!'
           token = readRelativeId(c)
           break
         when 'a'..'z', 'A'..'Z', '_'
           token = readId(c)
           break
+        when '<', '>', '='
+          token = readOperator(c)
+          break
         when '['
           token = readMacro
           break
@@ -274,8 +305,7 @@ class TaskJuggler
           break
         end
       end
-      @lastPos = @pos
-      @pos = SourceFileInfo.new(fileName, lineNo, columnNo)
+      @pos = startOfToken
       return token
     end
 
@@ -287,6 +317,7 @@ class TaskJuggler
         raise "Fatal Error: Cannot return more than 1 token in a row"
       end
       @tokenBuffer = token
+      @tokenBufferPos = @pos
       @pos = @lastPos
     end
 
@@ -315,20 +346,31 @@ class TaskJuggler
 
     # Call this function to report any errors related to the parsed input.
     def error(id, text, property = nil)
-      message = Message.new(id, 'error', text + "\n" + line.to_s,
-                            property, nil, sourceFileInfo)
-      @messageHandler.send(message)
-
-      until @macroStack.empty?
-        macro, args = @macroStack.pop
-        args.collect! { |a| '"' + a + '"' }
-        message = Message.new('macro_stack', 'info',
-                              "   #{macro.name} #{args.join(' ')}", nil, nil,
-                              macro.sourceFileInfo)
+      message('error', id, text, property)
+    end
+
+    def warning(id, text, property = nil)
+      message('warning', id, text, property)
+    end
+
+    def message(type, id, text, property)
+      unless text.empty?
+        message = Message.new(id, type, text + "\n" + line.to_s,
+                              property, nil, sourceFileInfo)
         @messageHandler.send(message)
+
+        until @macroStack.empty?
+          macro, args = @macroStack.pop
+          args.collect! { |a| '"' + a + '"' }
+          message = Message.new('macro_stack', 'info',
+                                "   #{macro.name} #{args.join(' ')}", nil, nil,
+                                macro.sourceFileInfo)
+          @messageHandler.send(message)
+        end
       end
 
-      raise TjException.new, 'Syntax error during parse'
+      # An empty strings signals an already reported error
+      raise TjException.new, '' if type == 'error'
     end
 
   private
@@ -337,6 +379,14 @@ class TaskJuggler
     # features a FIFO buffer that can hold any amount of returned characters.
     # When it has reached the end of the master file it returns nil.
     def nextChar
+      # We've started to find the next token. @pos no longer marks the
+      # position of the current token. Since we also store the EOF position in
+      # @pos, don't reset it if we have processed all files completely.
+      if @pos && @cf
+        @lastPos = @pos
+        @pos = nil
+      end
+
       if (c = nextCharI) == '$' && !@ignoreMacros
         # Double $ are reduced to a single $.
         return c if (c = nextCharI) == '$'
@@ -351,7 +401,7 @@ class TaskJuggler
         returnChar(c)
         macroParser = MacroParser.new(self, @messageHandler)
         begin
-          macroParser.parse('macroCall', false)
+          macroParser.parse('macroCall')
         rescue TjException
         end
         @ignoreMacros = false
@@ -379,13 +429,17 @@ class TaskJuggler
         # If EOF has been reached, try the parent file until even the master
         # file has been processed completely.
         if (c = @cf.getc).nil?
+          # Safe current position so an EOF related error can be properly
+          # reported.
+          @pos = sourceFileInfo
+
           @cf.close
           @fileStack.pop
           if @fileStack.empty?
             # We are done with the top-level file now.
-            @cf = @tokenBuffer = @pos = nil
+            @cf = @tokenBuffer = nil
           else
-            @cf, @tokenBuffer, @pos = @fileStack.last
+            @cf, @tokenBuffer, @lastPos = @fileStack.last
             Log << "Parsing file #{@cf.fileName} ..."
             # We have been called by nextToken() already, so we can't just
             # restore @tokenBuffer and be done. We need to feed the token text
@@ -442,6 +496,26 @@ class TaskJuggler
       end
     end
 
+    def handleDash
+      if (c1 = nextChar) == '8'
+        if (c2 = nextChar) == '<'
+          if (c3 = nextChar) == '-'
+            return readIndentedString
+          else
+            returnChar(c3)
+            returnChar(c2)
+            returnChar(c1)
+          end
+        else
+          returnChar(c2)
+          returnChar(c1)
+        end
+      else
+        returnChar(c1)
+      end
+      return [ 'LITERAL', ' - ']
+    end
+
     def readBlanks(c)
       loop do
         if c == ' '
@@ -611,6 +685,90 @@ class TaskJuggler
       [ 'STRING', token ]
     end
 
+    def readIndentedString
+      state = 0
+      indent = ''
+      token = ''
+      while true
+        case state
+        when 0 # Determining indent
+          if nextChar != "\n"
+            error('junk_after_cut',
+                  'The cut mark -8<- must be immediately followed by a ' +
+                  'line break.')
+          end
+          while (c = nextChar) == ' ' || c == "\t"
+            indent << c
+          end
+          returnChar(c)
+          state = 1
+        when 1 # reading '-' or first content line character
+          if (c = nextChar) == '-'
+            state = 3
+          elsif c.nil?
+            error('eof_in_istring1', 'Unexpected end of file in string')
+          elsif c == "\n"
+            token << c
+            state = 6
+          else
+            token << c
+            state = 2
+          end
+        when 2 # reading content line
+          while (c = nextChar) != "\n"
+            error('eof_in_istring2',
+                  'Unexpected end of file in string') if c.nil?
+            token << c
+          end
+          token << c
+          state = 6
+        when 3 # reading '>' of '->8-'
+          if (c = nextChar) == '>'
+            state = 4
+          else
+            error('eof_in_istring3',
+                  'Unexpected end of file in string') if c.nil?
+            token << '-'
+            token << c
+            state = 2
+          end
+        when 4 # reading '8' of '->8-'
+          if (c = nextChar) == '8'
+            state = 5
+          else
+            error('eof_in_istring4',
+                  'Unexpected end of file in string') if c.nil?
+            token << c
+            state = 2
+          end
+        when 5 # reading '-' of '->8-'
+          if (c = nextChar) == '-'
+            return [ 'STRING', token ]
+          else
+            error('eof_in_istring5',
+                  'Unexpected end of file in string') if c.nil?
+            token << c
+            state = 2
+          end
+        when 6 # reading indentation
+          state = 1
+          indent.each_utf8_char do |ci|
+            if ci != (c = nextChar)
+              if c == '-'
+                state = 3
+                break
+              else
+                error('bad_indent',
+                      'All string lines must have the exact same indentation.')
+              end
+            end
+          end
+        else
+          raise "State machine error"
+        end
+      end
+    end
+
     def readId(c)
       token = ""
       token << c
@@ -646,6 +804,24 @@ class TaskJuggler
       return [ 'MACRO', token ]
     end
 
+    # Read operators of logical expressions.
+    def readOperator(c)
+      case c
+      when '='
+        return [ 'LITERAL', '=' ]
+      when '>'
+        return [ 'LITERAL', '>=' ] if (c = nextChar) == '='
+        returnChar(c)
+        return [ 'LITERAL', '>' ]
+      when '<'
+        return [ 'LITERAL', '<=' ] if (c = nextChar) == '='
+        returnChar(c)
+        return [ 'LITERAL', '<' ]
+      else
+        raise "Unsupported operator #{c}"
+      end
+    end
+
     # Read only decimal digits and return the result als Fixnum.
     def readDigits
       token = ""

data/lib/Tj3Config.rb

@@ -13,7 +13,7 @@
 require 'UTF8String'
 require 'AppConfig'
 
-AppConfig.version = '0.0.2'
+AppConfig.version = '0.0.3'
 AppConfig.packageName = 'TaskJuggler III'
 AppConfig.packageInfo = 'A Project Mangement Software'
 AppConfig.copyright = [ (2006..2009).to_a ]

data/lib/TjTime.rb

@@ -60,6 +60,21 @@ class TaskJuggler
       TjTime.new(Time.local(*args).gmtime)
     end
 
+    # Check if +zone+ is a valid time zone.
+    def TjTime.checkTimeZone(zone)
+      return true if zone == 'UTC'
+
+      tz = ENV['TZ']
+      ENV['TZ'] = zone
+      newZone = Time.new.zone
+      # If the time zone is valid, the OS can convert a zone like
+      # 'America/Denver' into 'MST'. Unknown time zones are either not
+      # converted or cause a fallback to UTC.
+      res = (newZone != zone && newZone != 'UTC')
+      ENV['TZ'] = tz if tz
+      res
+    end
+
     # Align the date to a time grid. The grid distance is determined by _clock_.
     def align(clock)
       TjTime.new((@time.to_i / clock) * clock)

data/lib/TjpExample.rb

@@ -89,7 +89,7 @@ class TaskJuggler
             end
             snippetState[tag] = false
           else
-            raise "Bad indicator: #{line}"
+            raise "Bad indicator #{indicator}. Must be '+' or '-': #{line}"
           end
         else
           # Process the regular lines and add them to all currently active