Merging Jake Luciani's latest perl code gen fixes

Reviewed By: dreiss

Test Plan: Watch for any weirdness on Thrift code gen, perl specific


git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665206 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/compiler/cpp/src/thriftl.ll b/compiler/cpp/src/thriftl.ll
index 7693f33..d047acc 100644
--- a/compiler/cpp/src/thriftl.ll
+++ b/compiler/cpp/src/thriftl.ll
@@ -8,7 +8,7 @@
 
 /**
  * Thrift scanner.
- * 
+ *
  * Tokenizes a thrift definition file.
  * @author Mark Slee <mcslee@facebook.com>
  */
@@ -35,9 +35,9 @@
 /**
  * Provides the yylineno global, useful for debugging output
  */
-%option lex-compat 	
+%option lex-compat
 
-/** 
+/**
  * Helper definitions, comments, constants, and whatnot
  */
 
@@ -72,6 +72,7 @@
 "cpp_type"       { return tok_cpp_type;       }
 "java_package"   { return tok_java_package;   }
 "php_namespace"  { return tok_php_namespace;  }
+"perl_package"   { return tok_perl_package;   }
 "ruby_namespace" { return tok_ruby_namespace; }
 "xsd_all"        { return tok_xsd_all;        }
 "xsd_optional"   { return tok_xsd_optional;   }