fcshd 0.6.4 → 0.6.5

data/bin/fcshc

@@ -88,7 +88,7 @@ EOF
     $run_compilation = true
     if FCSHD::FlexHome.known?
       $extra_arguments << "-theme=#{FCSHD::FlexHome.halo_swc}"
-    else 
+    else
       die "must set $FLEX_HOME to use --halo option"
     end
   end
@@ -141,8 +141,7 @@ for name in ARGV
   end
 end
 
-ENV["FCSHD_LIBRARY_PATH"] ||= ""
-ENV["FCSHD_LIBRARY_PATH"] += ":~/.fcshd-lib"
+ENV["FCSHD_LIBRARY_PATH"] ||= "~/.fcshd-lib"
 
 def find_library(name)
   nil.tap do
@@ -174,22 +173,22 @@ end
 
 if $run_compilation
   $compiling_swc = $output_file && $output_file.end_with?(".swc")
-  
+
   if $compiling_swc
     if [$source_files, $directories, $library_files] == [[], [], []]
       die "must include at least one source file, directory, or SWC"
     end
-  
+
     $compilation_command = ["compc"]
-  
+
     for file in $source_files
       $compilation_command << "-include-sources+=#{file}"
     end
-  
+
     for directory in $directories
       $compilation_command << "-include-sources+=#{directory}"
     end
-  
+
     if FCSHD::FlexHome.known?
       for dir in FCSHD::FlexHome.framework_lib_dirs
         $extra_arguments << "-external-library-path+=#{dir}"
@@ -204,31 +203,31 @@ if $run_compilation
     else
       die "multiple source files not allowed when compiling SWF"
     end
-  
+
     if $directories.empty?
       $directories << File.dirname($source_file)
     end
-  
+
     if $output_file == nil
       $source_file.sub(/\.(as|mxml)$/, ".swf").tap do |x|
         $output_file = File.expand_path(File.basename(x))
       end
     end
-  
+
     $compilation_command = ["mxmlc", "#$source_file"]
   end
-  
+
   $compilation_command << "-output=#$output_file"
-  
+
   for directory in $directories
     $compilation_command << "-compiler.source-path+=#{directory}"
     $compilation_command << "-compiler.library-path+=#{directory}"
   end
-  
+
   for file in $library_files
     $compilation_command << "-compiler.library-path+=#{file}"
   end
-  
+
   $compilation_command.concat($extra_arguments)
 end
 

data/lib/fcshd/compiler.rb

@@ -64,7 +64,7 @@ module FCSHD
     rescue FCSHError => error
       case error.message
       when "Error: null"
-        @frontend.puts "fcshd: Adobe-internal error; restarting fcsh..."
+        @frontend.puts "fcshd: got mysterious error; restarting fcsh..."
         restart_fcsh_process!
         @frontend.puts "fcshd: retrying your compilation"
         compile_new!

data/lib/fcshd/source-location.rb

@@ -1,3 +1,5 @@
+require "pathname"
+
 module FCSHD
   class SourceLocation < Struct.new(:filename, :line_number)
     def to_s(basedir=nil)
@@ -5,11 +7,7 @@ module FCSHD
     end
 
     def relative_filename(basedir)
-      if basedir
-        filename.sub(/^#{Regexp.quote(basedir)}/, "")
-      else
-        filename
-      end
+      Pathname.new(filename).relative_path_from(Pathname.new(basedir))
     end
   end
 end

data/lib/fcshd/transcript-item.rb

@@ -53,6 +53,9 @@ error: hint: xmlns="http://www.adobe.com/2006/mxml" (Flex 3)
 EOF
       when /^Incorrect number of arguments. Expected (\d+)\.$/ then <<EOF
 error: expected #$1 arguments
+EOF
+      when /^Incorrect number of arguments. Expected no more than (\d+)\.$/ then <<EOF
+error: expected at most #$1 arguments
 EOF
       when
         /^Access of possibly undefined property (.+) through a reference with static type (.+)\.$/,
@@ -118,15 +121,22 @@ EOF
 error: #{quote $1} conflicts with an internal name
 EOF
       when
-        /^Warning: parameter '(.+)' has no type declaration\.$/,
         /^Warning: return value for function '(.+)' has no type declaration\.$/
       then
-        who = $1 == "anonymous" ? "anonymous function" : quote($1)
         <<EOF
-error: #{who} missing type declaration
+error: #{quote($1) + " " unless $1 == "anonymous"}missing return type
+EOF
+      when
+        /^Warning: parameter '(.+)' has no type declaration\.$/
+      then
+        <<EOF
+error: #{quote($1)} missing type
 EOF
       when /^A file found in a source-path must have the same package structure '(.*)', as the definition's package, '(.*)'\.$/ then <<EOF
 error: package should be #{quote $1}
+EOF
+      when /^A file found in a source-path '(.*)' must have the same name as the class definition inside the file '(.*)'\.$/ then <<EOF
+error: name should be #{quote $1}
 EOF
       when /^Comparison between a value with static type (.+) and a possibly unrelated type (.+)\.$/ then <<EOF
 error: comparing #$1 to #$2
@@ -142,9 +152,6 @@ error: setter must return void"
 EOF
       when "Function does not return a value." then <<EOF
 error: missing return statement"
-EOF
-      when "Syntax error: expecting identifier before rightparen." then <<EOF
-error: #{quote ")"} unexpected"
 EOF
       when
         /^The (.+) attribute can only be used inside a package\./,
@@ -152,13 +159,39 @@ EOF
       then
         <<EOF
 error: #{quote $1} unexpected
+EOF
+      when /^Syntax error: expecting (.+?) before (.+?)\.$/
+        <<EOF
+error: missing #{lexeme($1)} (found #{lexeme($2)} instead)
+EOF
+
+      when "Syntax error: XML does not have matching begin and end tags."
+        <<EOF
+error: XML tag mismatch
 EOF
       else
         mxmlc_message
       end
     end
 
+    def name(string) string.sub!(":", ".") end
     def quote(string) "‘#{string}’" end
-    def name(string) string.sub! ":", "." end
+
+    def lexeme(name)
+      parse_line = lambda { |line| line.chomp.split(/\s*\|\s*/, 2) }
+      Hash[<<EOF.lines.map(&parse_line)][name] || quote(name)
+colon          | ‘:’
+semicolon      | ‘;’
+leftparen      | ‘(’
+rightparen     | ‘)’
+leftbracket    | ‘[’
+rightbracket   | ‘]’
+leftbrace      | ‘{’
+rightbrace     | ‘}’
+xmltagstartend | ‘</>’
+identifier     | expression
+end of program | eof
+EOF
+    end
   end
 end

data/lib/fcshd/transcript-parser.rb

@@ -24,10 +24,12 @@ module FCSHD
 
         when /^(\/.+?)(?:\((\d+)\))?: (?:col: \d+ )?(.+)$/
           result << Transcript::Item[SourceLocation[$1, $2.to_i], $3]
-          skip_indented_lines! # Ignore the "diagram" of the problem.
+          skip_problem_diagram!
+          skip_indented_lines!
 
         when /^Required RSLs:$/
-          skip_indented_lines! # Does anybody care about this?
+          # Does anybody care about this?
+          skip_indented_lines!
 
         when /^(Recompile|Reason|Updated): /
         when /^Loading configuration file /
@@ -59,6 +61,10 @@ module FCSHD
       lines.first.chomp
     end
 
+    def skip_problem_diagram!
+      lines.shift(4) if lines[0...4].grep /^\s*\^\s*$/
+    end
+
     def skip_indented_lines!
       skip_line! until lines.empty? or current_line =~ /^\S/
     end

data/lib/fcshd/version.rb

@@ -1,5 +1,5 @@
 unless defined? FCSHD::VERSION
   module FCSHD
-    VERSION = "0.6.4"
+    VERSION = "0.6.5"
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fcshd
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 13
+  prerelease: 
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Daniel Brockman
@@ -14,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-07 00:00:00 +01:00
-default_executable: 
+date: 2012-03-09 00:00:00 Z
 dependencies: []
 
 description: |
@@ -55,7 +55,6 @@ files:
 - lib/fcshd/transcript-parser.rb
 - lib/fcshd/transcript.rb
 - lib/fcshd/version.rb
-has_rdoc: true
 homepage: http://github.com/dbrock/fcshd
 licenses: []
 
@@ -65,23 +64,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Usable CLI for the Adobe Flex compiler shell (fcsh)