Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AMD module generator should be able to define dependencies #202

Merged
merged 6 commits into from
Feb 16, 2014
Merged

AMD module generator should be able to define dependencies #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3950be8
Added ability to specify dependencies of AMD module to AMD module gen…
highwaycoder Dec 14, 2013
fbdd6bf
Fixed error in last commit
highwaycoder Dec 14, 2013
2c1e812
Added ability to name the AMD module as well as adding dependencies.
highwaycoder Dec 15, 2013
9fe883c
Removed dependency on JSON.stringify which I believe was causing the …
highwaycoder Dec 17, 2013
e7a7e82
Removed module name as it was causing more problems than it solved, a…
highwaycoder Dec 17, 2013
2175073
Use requireJS commonJS sugar instead of dependencies as arguments to …
highwaycoder Dec 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/jison.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ lrGeneratorMixin.generate = function parser_generate (opt) {

lrGeneratorMixin.generateAMDModule = function generateAMDModule(opt){
opt = typal.mix.call({}, this.options, opt);
var out = '\n\ndefine([], function(){'
var out = '\n\ndefine(function(require){'
+ '\nvar parser = '+ this.generateModule_(opt)
+ "\n"+this.moduleInclude
+ (this.lexer && this.lexer.generateModule ?
Expand Down
2 changes: 1 addition & 1 deletion tests/parser/generator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ exports["test amd module generator"] = function() {

var parserSource = gen.generateAMDModule();
var parser = null,
define = function(deps, callback){
define = function(callback){
// temporary AMD-style define function, for testing.
parser = callback();
};
Expand Down