taskjuggler 0.0.3 → 0.0.4

data/lib/TextParser.rb

@@ -3,7 +3,7 @@
 #
 # = TextParser.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -71,10 +71,19 @@ class TaskJuggler
       @rules = { }
       # Array to hold the token types that the scanner can return.
       @variables = []
+      # An list of token types that are not allowed in the current context.
+      @badVariables = []
       # The currently processed rule.
       @cr = nil
-      # If set to a value larger than 0 debug output will be generated.
-      @@debug = 30
+    end
+
+    # Limit the allowed tokens of the scanner to the subset passed by the
+    # _tokenSet_ Array.
+    def limitTokenSet(tokenSet)
+      return unless tokenSet
+
+      @badVariables = @variables.dup
+      @badVariables.delete_if { |v| tokenSet.include?(v) }
     end
 
     # Call all methods that start with 'rule_' to initialize the rules.
@@ -197,7 +206,7 @@ class TaskJuggler
     def getTransitions(rule)
       # If we have processed this rule before we can just return a copy
       # of the transitions of this rule. This avoids endless recursions.
-      return rule.transitions.clone unless rule.transitions.empty?
+      return rule.transitions.dup unless rule.transitions.empty?
 
       rule.transitions = []
       rule.patterns.each do |pat|
@@ -241,7 +250,7 @@ class TaskJuggler
         end
         rule.transitions << transitions
       end
-      rule.transitions.clone
+      rule.transitions.dup
     end
 
     def checkRule(rule)
@@ -255,8 +264,8 @@ class TaskJuggler
           token = tok[1..-1]
           if type == ?$
             if @variables.index(token).nil?
-              raise "Fatal Error: Illegal variable type #{token} used for " +
-                    "rule #{rule.name} in pattern '#{pat}'"
+              error('unsupported_token',
+                    "The token #{token} is not supported here.")
             end
           elsif type == ?!
             if @rules[token].nil?
@@ -280,12 +289,7 @@ class TaskJuggler
       loop do
         # At the beginning of a rule we need a token from the input to determine
         # which pattern of the rule needs to be processed.
-        begin
-          token = nextToken
-          Log << "Token: [#{token[0]}][#{token[1]}]"
-        rescue TjException
-          error('parse_rule1', $!.message)
-        end
+        token = getNextToken
 
         # The scanner cannot differentiate between keywords and identifiers. So
         # whenever an identifier is returned we have to see if we have a
@@ -347,17 +351,13 @@ class TaskJuggler
               returnToken(token)
               token = nil
             end
-            @stack.last.store(parseRule(@rules[elToken]))
+            @stack.last.store(parseRule(@rules[elToken]),
+                              @scanner.sourceFileInfo)
           else
             # In case the element is a keyword or variable we have to get a new
             # token if we don't have one anymore.
             if token.nil?
-              begin
-                token = nextToken
-                Log << "Token: [#{token[0]}][#{token[1]}]"
-              rescue TjException
-                error('parse_rule2', $!.message)
-              end
+              token = getNextToken
             end
 
             if elType == ?_
@@ -371,7 +371,7 @@ class TaskJuggler
                 end
                 error('spec_keywork_expctd', text)
               end
-              @stack.last.store(elToken)
+              @stack.last.store(elToken, @scanner.sourceFileInfo)
             elsif elType == ?.
               if token != [ '.', '<END>' ]
                 error('end_expected', 'End expected but found ' +
@@ -388,7 +388,7 @@ class TaskJuggler
                 error('spec_token_expctd', text)
               end
               # If the element is a variable store the value of the token.
-              @stack.last.store(token[1])
+              @stack.last.store(token[1], @scanner.sourceFileInfo)
             end
             # The token has been consumed. Reset the variable.
             token = nil
@@ -421,6 +421,20 @@ class TaskJuggler
       return result
     end
 
+    def getNextToken
+      begin
+        token = nextToken
+        Log << "Token: [#{token[0]}][#{token[1]}]"
+      rescue TjException
+        error('parse_rule', $!.message)
+      end
+      if @badVariables.include?(token[0])
+        error('unsupported_token',
+              "The token #{token[1]} is not supported in this context.")
+      end
+      token
+    end
+
   end
 
 end

data/lib/TextParser/Pattern.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = TextParser/Pattern.rb -- The TaskJuggler III Project Management Software
+# = Pattern.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -200,7 +200,7 @@ class TaskJuggler::TextParser
         if @args[i]
           # The argument is documented in the syntax definition. We copy the
           # entry as we need to modify it.
-          argDoc = @args[i].clone
+          argDoc = @args[i].dup
 
           # A documented argument without a name is a terminal token. We use the
           # terminal symbol as name.

data/lib/TextParser/Rule.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = TextParser/Rule.rb -- The TaskJuggler III Project Management Software
+# = Rule.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/TextParser/StackElement.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = TextParser/StackElement.rb -- The TaskJuggler III Project Management Software
+# = StackElement.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -35,9 +35,10 @@ class TaskJuggler::TextParser
     end
 
     # Store a collected value and move the position to the next pattern.
-    def store(val)
+    def store(val, sourceFileInfo = nil)
       @val[@position] = val
       @position += 1
+      @sourceFileInfo = sourceFileInfo if sourceFileInfo
     end
 
   end

data/lib/TextParser/TokenDoc.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = ParserTokenDoc.rb -- The TaskJuggler III Project Management Software
+# = TokenDoc.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/TextScanner.rb

@@ -3,7 +3,7 @@
 #
 # = TextScanner.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -61,7 +61,6 @@ class TaskJuggler
         @bytes = 0
         Log << "Parsing file #{@fileName} ..."
         Log.startProgressMeter("Reading file #{fileName}")
-
       end
 
       def close
@@ -158,11 +157,13 @@ class TaskJuggler
       # In certain situation we want to ignore Macro replacement and this flag
       # is set to true.
       @ignoreMacros = false
+      @fileNameIsBuffer = false
     end
 
     # Start the processing. if _fileNameIsBuffer_ is true, we operate on a
     # String, else on a File.
     def open(fileNameIsBuffer = false)
+      @fileNameIsBuffer = fileNameIsBuffer
       if fileNameIsBuffer
         @fileStack = [ [ @cf = BufferStreamHandle.new(@masterFile), nil, nil ] ]
       else
@@ -178,8 +179,10 @@ class TaskJuggler
 
     # Finish processing and reset all data structures.
     def close
-      Log.startProgressMeter("Reading file #{@masterFile}")
-      Log.stopProgressMeter
+      unless @fileNameIsBuffer
+        Log.startProgressMeter("Reading file #{@masterFile}")
+        Log.stopProgressMeter
+      end
       @fileStack = []
       @cf = @tokenBuffer = nil
     end
@@ -188,13 +191,14 @@ class TaskJuggler
     # file is finished, we will continue in the old file after the location
     # where we started with the new file.
     def include(fileName)
-      if @fileStack.empty?
-        path = @masterPath
-      else
-        path = @fileStack.last[0].dirname + '/'
-        @fileStack.last[1, 2] = [ @tokenBuffer, @pos ]
-      end
       if fileName[0] != '/'
+        if @fileStack.empty?
+          path = @masterPath
+        else
+          pathOfCallingFile = @fileStack.last[0].dirname
+          path = pathOfCallingFile.empty? ? '' : pathOfCallingFile + '/'
+          @fileStack.last[1, 2] = [ @tokenBuffer, @pos ]
+        end
         # If the included file is not an absolute name, we interpret the file
         # name relative to the including file.
         fileName = path + fileName
@@ -222,7 +226,7 @@ class TaskJuggler
 
     # Return SourceFileInfo for the current processing prosition.
     def sourceFileInfo
-      @pos ? @pos.clone : SourceFileInfo.new(fileName, lineNo, columnNo)
+      @pos ? @pos.dup : SourceFileInfo.new(fileName, lineNo, columnNo)
     end
 
     # Return the name of the currently processed file. If we are working on a
@@ -255,7 +259,7 @@ class TaskJuggler
       end
 
       # Start processing characters from the input.
-      startOfToken = SourceFileInfo.new(fileName, lineNo, columnNo)
+      @startOfToken = SourceFileInfo.new(fileName, lineNo, columnNo)
       token = [ '.', '<END>' ]
       while c = nextChar
         case c
@@ -264,14 +268,14 @@ class TaskJuggler
             token = tok
             break
           end
-          startOfToken = SourceFileInfo.new(fileName, lineNo, columnNo)
+          @startOfToken = SourceFileInfo.new(fileName, lineNo, columnNo)
         when '#'
           skipComment
-          startOfToken = SourceFileInfo.new(fileName, lineNo, columnNo)
+          @startOfToken = SourceFileInfo.new(fileName, lineNo, columnNo)
         when '/'
           skipCPlusPlusComments
-          startOfToken = SourceFileInfo.new(fileName, lineNo, columnNo)
-        when '0'..'9'
+          @startOfToken = SourceFileInfo.new(fileName, lineNo, columnNo)
+          when '0'..'9'
           token = readNumber(c)
           break
         when "'"
@@ -284,7 +288,12 @@ class TaskJuggler
           token = handleDash
           break
         when '!'
-          token = readRelativeId(c)
+          if (c = nextChar) == '='
+            token = [ 'LITERAL', '!=' ]
+          else
+            returnChar(c)
+            token = [ 'LITERAL', '!' ]
+          end
           break
         when 'a'..'z', 'A'..'Z', '_'
           token = readId(c)
@@ -305,7 +314,7 @@ class TaskJuggler
           break
         end
       end
-      @pos = startOfToken
+      @pos = @startOfToken
       return token
     end
 
@@ -335,6 +344,9 @@ class TaskJuggler
       macro, text = @macroTable.resolve(args, sourceFileInfo)
       return if text == ''
 
+      if @macroStack.length > 20
+        error('macro_stack_overflow', "Too many nested macro calls.")
+      end
       @macroStack << [ macro, args ]
       # Mark end of macro with a 0 element
       @cf.charBuffer << 0
@@ -570,21 +582,6 @@ class TaskJuggler
       [ 'INTEGER', token.to_i ]
     end
 
-    def readRelativeId(c)
-      token = ""
-      token << c
-      while (c = nextChar) && c == '!'
-        token << c
-      end
-      unless ('a'..'z') === c || ('A'..'Z') === c || c == '_'
-        raise TjException.new, "Identifier expected"
-      end
-      id = readId(c)
-      id[0] = 'RELATIVE_ID'
-      id[1] = token + id[1]
-      id
-    end
-
     def readDate(token)
       year = token.to_i
       if year < 1970 || year > 2030
@@ -692,7 +689,11 @@ class TaskJuggler
       while true
         case state
         when 0 # Determining indent
-          if nextChar != "\n"
+          # Skip trailing spaces and tabs.
+          while (c = nextChar) == ' ' || c == "\t" do
+            # empty on purpose
+          end
+          if c != "\n"
             error('junk_after_cut',
                   'The cut mark -8<- must be immediately followed by a ' +
                   'line break.')
@@ -700,6 +701,7 @@ class TaskJuggler
           while (c = nextChar) == ' ' || c == "\t"
             indent << c
           end
+          @startOfToken = SourceFileInfo.new(fileName, lineNo, columnNo)
           returnChar(c)
           state = 1
         when 1 # reading '-' or first content line character
@@ -757,6 +759,9 @@ class TaskJuggler
               if c == '-'
                 state = 3
                 break
+              elsif c == "\n"
+                returnChar(c)
+                break
               else
                 error('bad_indent',
                       'All string lines must have the exact same indentation.')
@@ -796,10 +801,20 @@ class TaskJuggler
     end
 
     def readMacro
+      # We can deal with ']' inside of the macro as long as each ']' is
+      # preceeded by a corresponding '['.
       token = ''
-      while (c = nextCharI) != ']'
-        error('unterminated_macro', "Unterminated macro #{token}") unless c
-        token << c
+      bracketLevel = 1
+      while bracketLevel > 0
+        case (c = nextCharI)
+        when nil
+          error('unterminated_macro', "Unterminated macro #{token}")
+        when '['
+          bracketLevel += 1
+        when ']'
+          bracketLevel -= 1
+        end
+        token << c unless bracketLevel == 0
       end
       return [ 'MACRO', token ]
     end

data/lib/Tj3Config.rb

@@ -3,7 +3,7 @@
 #
 # = Tj3Config.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -13,10 +13,11 @@
 require 'UTF8String'
 require 'AppConfig'
 
-AppConfig.version = '0.0.3'
-AppConfig.packageName = 'TaskJuggler III'
-AppConfig.packageInfo = 'A Project Mangement Software'
-AppConfig.copyright = [ (2006..2009).to_a ]
+AppConfig.version = '0.0.4'
+AppConfig.packageName = 'taskjuggler'
+AppConfig.softwareName = 'TaskJuggler III'
+AppConfig.packageInfo = 'A Project Management Software'
+AppConfig.copyright = [ (2006..2010).to_a ]
 AppConfig.authors = [ 'Chris Schlaeger <cs(a)kde.org>' ]
 AppConfig.contact = 'http://www.taskjuggler.org'
 AppConfig.license = <<'EOT'

data/lib/TjException.rb

@@ -3,7 +3,7 @@
 #
 # = TjException.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/TjTime.rb

@@ -3,7 +3,7 @@
 #
 # = TjTime.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -64,13 +64,22 @@ class TaskJuggler
     def TjTime.checkTimeZone(zone)
       return true if zone == 'UTC'
 
+      # Valid time zones must be of the form 'Region/City'
+      return false unless zone.include?('/')
+
+      # Save curent value of TZ
       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')
+      # Since glibc 2.10 Time.new.zone only return the region for illegal
+      # zones instead of the full zone string like it does on earlier
+      # versions.
+      region = zone[0..zone.index('/') - 1]
+      res = (newZone != zone && newZone != region && newZone != 'UTC')
+      # Restore TZ if it was set earlier.
       ENV['TZ'] = tz if tz
       res
     end
@@ -331,7 +340,7 @@ class TaskJuggler
         format = '%Y-%m-%d-%H:%M' + (@time.sec == 0 ? '' : ':%s') + '-%z'
       end
       # Always report values in local timezone
-      @time.clone.localtime.strftime(format)
+      @time.dup.localtime.strftime(format)
     end
 
     # Return the seconds since Epoch.