ScriptName now returns FqName, fully qualified with package name. Update usages and convert to internal format as needed.

compiler/backend/src/org/jetbrains/jet/codegen/KotlinCodegenFacade.java

@@ -38,10 +38,11 @@ public class KotlinCodegenFacade {
         for (JetFile file : state.getFiles()) {
             if (file.isScript()) {
                 // SCRIPT: register class name for scripting from this file, move outside of this function
-                String name = ScriptNameUtil.classNameForScript(file);
+                FqName name = ScriptNameUtil.classNameForScript(file);
                 JetScript script = file.getScript();
                 assert script != null;
-                registerClassNameForScript(state.getBindingTrace(), script, Type.getObjectType(name));
+                Type type = AsmUtil.asmTypeByFqNameWithoutInnerClasses(name);
+                registerClassNameForScript(state.getBindingTrace(), script, type);
             }
         }
 

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java

@@ -235,7 +235,8 @@ public class KotlinToJVMBytecodeCompiler {
                                                    }, AllModules.class.getClassLoader())
             );
 
-            return classLoader.loadClass(ScriptNameUtil.classNameForScript(environment.getSourceFiles().get(0)));
+            FqName nameForScript = ScriptNameUtil.classNameForScript(environment.getSourceFiles().get(0));
+            return classLoader.loadClass(nameForScript.asString());
         }
         catch (Exception e) {
             throw new RuntimeException("Failed to evaluate script: " + e, e);

compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java

@@ -113,7 +113,8 @@ public class ScriptHeaderResolver {
             priority = 0;
         }
 
-        Name className = new FqName(ScriptNameUtil.classNameForScript((JetFile) script.getContainingFile()).replace('/', '.')).shortName();
+        FqName nameForScript = ScriptNameUtil.classNameForScript((JetFile) script.getContainingFile());
+        Name className = nameForScript.shortName();
         ScriptDescriptor scriptDescriptor = new ScriptDescriptor(ns, priority, outerScope, className);
 
         //WriteThroughScope scriptScope = new WriteThroughScope(

compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java

@@ -20,12 +20,13 @@ import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
 import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetPackageDirective;
+import org.jetbrains.jet.lang.resolve.name.FqName;
 
 public class ScriptNameUtil {
     private ScriptNameUtil() {
     }
 
-    public static String classNameForScript(JetFile file) {
+    public static FqName classNameForScript(JetFile file) {
         JetScriptDefinition scriptDefinition = JetScriptDefinitionProvider.getInstance(file.getProject()).findScriptDefinition(file);
 
         String name = file.getName();
@@ -40,10 +41,11 @@ public class ScriptNameUtil {
                 name = name.substring(0,index);
         }
         name = Character.toUpperCase(name.charAt(0)) + (name.length() == 0 ? "" : name.substring(1));
+        name = name.replace('.', '_');
         JetPackageDirective directive = file.getPackageDirective();
-        if(directive != null && directive.getName().length() > 0) {
-            name = directive.getName().replace('.','/') + "/" + name;
+        if(directive != null && directive.getQualifiedName().length() > 0) {
+            name = directive.getQualifiedName() + "." + name;
         }
-        return name;
+        return new FqName(name);
     }
 }

compiler/testData/script/fib.pkg.ktscript

@@ -0,0 +1,11 @@
+package kotlin.scripting.fibonacci
+// this script expected parameter num : Int
+
+fun fib(n: Int): Int {
+    val v = if(n < 2) 1 else fib(n-1) + fib(n-2)
+    System.out.println("fib($n)=$v")
+    return v
+}
+
+System.out.println("num: $num")
+val result = fib(num)

compiler/tests/org/jetbrains/jet/ScriptTest.java

@@ -49,6 +49,13 @@ public class ScriptTest {
         aClass.getConstructor(int.class).newInstance(4);
     }
 
+    @Test
+    public void testScriptWithPackage() throws Exception {
+        Class<?> aClass = compileScript("fib.pkg.ktscript", numIntParam(), Collections.<JetScriptDefinition>emptyList());
+        Assert.assertNotNull(aClass);
+        aClass.getConstructor(int.class).newInstance(4);
+    }
+
     @Test
     public void testScriptStandardExt() throws Exception {
         Class<?> aClass = compileScript("fib.kt", numIntParam(), Collections.<JetScriptDefinition>emptyList());

compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java

@@ -24,6 +24,7 @@ import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
 import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
 import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
 import org.jetbrains.jet.lang.resolve.ScriptNameUtil;
+import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.utils.UtilsPackage;
 
 import java.lang.reflect.Constructor;
@@ -52,7 +53,8 @@ public class ScriptGenTest extends CodegenTestCase {
         loadFile(filename);
 
         try {
-            Class<?> scriptClass = generateClass(ScriptNameUtil.classNameForScript(myFiles.getPsiFile()));
+            FqName fqName = ScriptNameUtil.classNameForScript(myFiles.getPsiFile());
+            Class<?> scriptClass = generateClass(fqName.asString());
 
             Constructor constructor = getConstructor(scriptClass);
             scriptInstance = constructor.newInstance(myFiles.getScriptParameterValues().toArray());