- Initial patch to support importing from class scopes (for Stig).

- It isn't complete yet but I want to work on it from another machine. It
- shouldn't break anything else so just don't try and use it.
- The following is a teaser of something that already works:
<?php

	class MyClass
	{
		function hello()
		{
			print "Hello, World\n";
		}
		class MyClass2
		{
			function hello()
			{
				print "Hello, World in MyClass2\n";
			}
		}
	}

	import function hello, class MyClass2 from MyClass;

	MyClass2::hello();
	hello();
?>

1 files changed, 8 insertions, 0 deletions

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 16ad7d8c82..d3b2f03c4e 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -669,6 +669,14 @@ NEWLINE ("\r"|"\n"|"\r\n")
 	return T_INCLUDE;
 }
 
+<ST_IN_SCRIPTING>"import" {
+	return T_IMPORT;
+}
+
+<ST_IN_SCRIPTING>"from" {
+	return T_FROM;
+}
+
 <ST_IN_SCRIPTING>"include_once" {
 	return T_INCLUDE_ONCE;
 }