fcshd 0.6.5 → 0.6.6

data/bin/fcshc

@@ -124,10 +124,11 @@ EOF
   parser.separator "TL;DR: $ fcshc src/my_app.mxml"
 end.parse!
 
-$run_compilation = true unless $run_compilation == false
 $extra_arguments << "-debug" unless $production
 
 for name in ARGV
+  $run_compilation = true
+
   if not File.exists? name
     die "no such file or directory: #{name}"
   elsif File.directory? name
@@ -231,30 +232,47 @@ if $run_compilation
   $compilation_command.concat($extra_arguments)
 end
 
-warn $compilation_command.join(" ") if $verbose
-exit if $dry_run
+def run_command(command)
+  begin
+    host, port = "localhost", FCSHD::Server::PORT
+    socket = TCPSocket.new(host, port)
+  rescue Errno::ECONNREFUSED
+    die "could not connect to fcshd at #{host}:#{port}"
+  end
+
+  socket.puts command
 
-begin
-  host, port = "localhost", FCSHD::Server::PORT
-  socket = TCPSocket.new(host, port)
-rescue Errno::ECONNREFUSED
-  die "could not connect to fcshd at #{host}:#{port}"
+  compiler_output = ""
+  socket.each_line do |line|
+    case line
+    when /^fcshd: /
+      warn line.chomp
+    else
+      compiler_output << line
+    end
+  end
+
+  if $verbose
+    STDOUT.write compiler_output
+  end
+
+  compiler_output
 end
 
-socket.puts "restart" if $restart_compiler
-socket.puts $compilation_command.join(" ") if $run_compilation
+run_command "restart" if $restart_compiler
+
+if $run_compilation
+  command = $compilation_command.join(" ")
 
-compiler_output = ""
-socket.each_line do |line|
-  case line
-  when /^fcshd: /
-    warn line.chomp
+  if $dry_run
+    warn command if $verbose
   else
-    compiler_output << line
+    compiler_output = run_command command
+    transcript = FCSHD::Transcript[compiler_output]
+
+    basedir = File.join(File.expand_path("."), "")
+    STDOUT.write transcript.to_s(basedir)
+
+    exit 1 if not transcript.succeeded?
   end
 end
-
-transcript = FCSHD::Transcript[compiler_output]
-basedir = File.join(File.expand_path("."), "")
-STDOUT.write transcript.to_s(basedir)
-exit 1 if not transcript.succeeded?

data/bin/fcshc-repl

@@ -33,18 +33,13 @@ end
 
 program_template = <<EOF
 package {
-  import stdio.flash.Sprite
-  import stdio.process
-  import stdlib.inspect
-  import flash.utils.*
+  import stdio.Sprite
 
+  [SWF(width=0, height=0)]
   public class dummy extends Sprite {
-    override public function main(): void {
-      process.immortal = false
-      process.whiny = true
-
+    public function main(): void {
       try {
-        process.warn(inspect(__CODE__))
+        process.warn(__CODE__)
       } finally {
         process.exit()
       }
@@ -57,13 +52,11 @@ get_program = lambda do |code|
   program_template.sub("__CODE__", code)
 end
 
-class MyInterrupt < StandardError; end
-
 while line = Readline.readline("as3> ", true)
   File.open("dummy.as", "w") { |file| file << get_program[line] }
-  output = `fcshc -lstdlib -lstdio -lknock --no-rsls dummy.as`
+  output = `fcshc -lstdio --no-rsls dummy.as`
   puts output.gsub(/^dummy.as:\d+: /, "") unless output == ""
-  if $? == 0
-    system "run-stdio-swf dummy.swf"
-  end
+  system "run-swf dummy.swf" if $? == 0
 end
+
+puts

data/bin/fcshd

@@ -22,16 +22,16 @@ EOF
 logger.log "fcshd #{FCSHD::VERSION}"
 
 compiler = FCSHD::Compiler.new(logger)
-compiler.start! 
+compiler.start!
 
 Thread.abort_on_exception = true
 
 begin
+  logger.log "listening to port #{FCSHD::Server::PORT}..."
   FCSHD::Server.new(FCSHD::Server::PORT, compiler, logger).run!
-  logger.log "Now listening to port #{FCSHD_PORT}."
 rescue Interrupt
   logger.log ""
-  logger.log "Exiting."
+  logger.log "exiting"
 rescue Exception => error
-  logger.error "Could not listen to port #{FCSHD_PORT}: #{error}"
+  logger.error "could not listen to port #{FCSHD::Server::PORT}: #{error}"
 end

data/lib/fcshd/transcript-item.rb

@@ -4,7 +4,7 @@ module FCSHD
   class Transcript; end
   class Transcript::Item < Struct.new(:location, :mxmlc_message)
     def to_s(basedir)
-      problems.map { |problem| problem.to_s(basedir) }.join("\n")
+      problems.map { |problem| problem.to_s(basedir) + "\n" }
     end
 
     def problems
@@ -57,6 +57,17 @@ EOF
       when /^Incorrect number of arguments. Expected no more than (\d+)\.$/ then <<EOF
 error: expected at most #$1 arguments
 EOF
+
+      when /^Interface method (.+) in namespace (.+) not implemented by class (.+)\.$/ then <<EOF
+error: #{quote $1} (from #{name $2}) not implemented
+EOF
+      when /^Interface method (.+) in namespace (.+) not implemented by class (.+)\.$/ then <<EOF
+error: #{quote $1} (from #{name $2}) not implemented
+EOF
+      when /^Interface method (.+) in namespace (.+) is implemented with an incompatible signature in class (.+)\.$/ then <<EOF
+error: #{quote $1} (from #{name $2}) implemented incorrectly
+EOF
+
       when
         /^Access of possibly undefined property (.+) through a reference with static type (.+)\.$/,
         /^Call to a possibly undefined method (.+) through a reference with static type (.+)\.$/,
@@ -64,7 +75,7 @@ EOF
       then <<EOF
 error: #{quote $1} undeclared in #{name $2}
 EOF
-      when /^Attempted access of inaccessible property (.+) through a reference with static type (.+)\.$/ then <<EOF
+      when /^Attempted access of inaccessible (?:property|method) (.+) through a reference with static type (.+)\.$/ then <<EOF
 error: #{quote $1} inaccessible in #{name $2}
 EOF
       when
@@ -120,18 +131,17 @@ EOF
       when /^A conflict exists with definition (.+) in namespace internal\.$/ then <<EOF
 error: #{quote $1} conflicts with an internal name
 EOF
-      when
-        /^Warning: return value for function '(.+)' has no type declaration\.$/
-      then
+      when /^Warning: return value for function '(.+)' has no type declaration\.$/ then
         <<EOF
 error: #{quote($1) + " " unless $1 == "anonymous"}missing return type
 EOF
-      when
-        /^Warning: parameter '(.+)' has no type declaration\.$/
-      then
-        <<EOF
+      when /^Warning: parameter '(.+)' has no type declaration\.$/ then <<EOF
 error: #{quote($1)} missing type
 EOF
+
+       when "Warning: This compilation unit did not have a factoryClass specified in Frame metadata to load the configured runtime shared libraries. To compile without runtime shared libraries either set the -static-link-runtime-shared-libraries option to true or remove the -runtime-shared-libraries option."
+       then []
+
       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
@@ -146,9 +156,15 @@ error: modifying constant
 EOF
       when "Function does not have a body." then <<EOF
 error: missing function body"
+EOF
+      when "Return value must be undefined." then <<EOF
+error: cannot return something here
+EOF
+      when "Return type of a getter definition must not be void." then <<EOF
+error: must return something
 EOF
       when "Return type of a setter definition must be unspecified or void." then <<EOF
-error: setter must return void"
+error: setter must not return anything"
 EOF
       when "Function does not return a value." then <<EOF
 error: missing return statement"

data/lib/fcshd/transcript-parser.rb

@@ -28,21 +28,16 @@ module FCSHD
           skip_indented_lines!
 
         when /^Required RSLs:$/
-          # Does anybody care about this?
           skip_indented_lines!
 
         when /^(Recompile|Reason|Updated): /
         when /^Loading configuration file /
         when "Detected configuration changes. Recompile..."
 
+        when /^fcshd: /
+          result << line
         else
-          # Let unrecognized lines pass through verbatim.
-          if line.start_with? "fcshd: "
-            result << line
-          else
-            # XXX: What about when we support compc?
-            result << "mxmlc: #{line}"
-          end
+          result << "mxmlc: #{line}" # XXX: Could be `compc` too.
         end
       end
     end
@@ -62,7 +57,7 @@ module FCSHD
     end
 
     def skip_problem_diagram!
-      lines.shift(4) if lines[0...4].grep /^\s*\^\s*$/
+      lines.shift(4) unless lines[0...4].grep(/^\s*\^\s*$/).empty?
     end
 
     def skip_indented_lines!

data/lib/fcshd/transcript.rb

@@ -21,9 +21,9 @@ module FCSHD
       @items.map do |item|
         case item
         when Item
-          "#{item.to_s(basedir)}\n"
+          item.to_s(basedir)
         else
-          "#{item}\n"
+          item
         end
       end.join
     end

data/lib/fcshd/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fcshd
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Daniel Brockman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-09 00:00:00 Z
+date: 2012-03-21 00:00:00 Z
 dependencies: []
 
 description: |
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: Usable CLI for the Adobe Flex compiler shell (fcsh)