Skip to content

Commit

Permalink
Fix for objj_import using old code.
Browse files Browse the repository at this point in the history
[cappuccino#82 state:resolved]

Reviewed by me.
  • Loading branch information
Francisco Ryan Tolmasky I committed Oct 3, 2008
1 parent 3a50d35 commit 7a69d6e
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions Objective-J/evaluate.js
Expand Up @@ -66,7 +66,6 @@ function objj_context()

#define IS_FILE(aFragment) (aFragment.type & FRAGMENT_FILE)
#define IS_LOCAL(aFragment) (aFragment.type & FRAGMENT_LOCAL)
#define IS_IMPORT(aFragment) (aFragment.type & FRAGMENT_IMPORT)

function fragment_create_code(aCode, aBundle, aFile)
{
Expand All @@ -80,11 +79,11 @@ function fragment_create_code(aCode, aBundle, aFile)
return fragment;
}

function fragment_create_file(aPath, aBundle, isLocal, isImport, aFile)
function fragment_create_file(aPath, aBundle, isLocal, aFile)
{
var fragment = new objj_fragment();

SET_TYPE(fragment, FRAGMENT_FILE | (FRAGMENT_LOCAL * isLocal) | (FRAGMENT_IMPORT * isImport));
SET_TYPE(fragment, FRAGMENT_FILE | (FRAGMENT_LOCAL * isLocal));
SET_PATH(fragment, aPath);
SET_BUNDLE(fragment, aBundle);
SET_FILE(fragment, aFile);
Expand Down Expand Up @@ -233,7 +232,7 @@ function objj_import(aPath, isLocal, didCompleteCallback)
var context = new objj_context();

context.didCompleteCallback = didCompleteCallback;
context.pushFragment(fragment_create_file(aPath, isLocal, YES));
context.pushFragment(fragment_create_file(aPath, new objj_bundle(""), isLocal, NULL));

context.evaluate();
}

0 comments on commit 7a69d6e

Please sign in to comment.