Commitbc77038

John Haley

committed

Fixed callbacks to be null unless set in structs

1 parent2b0ee55 commitbc77038Copy full SHA for bc77038

File tree

-2

lines changed

generate/templates
- partials
  - field_accessors.cc
- templates
  - struct_content.cc
test/tests
- diff.js

-2

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,10 @@`
`43`	`43`
`44`	`44`	`{% elsif field.isCallbackFunction %}`
`45`	`45`	`if (value->IsFunction()) {`
	`46`	`+if (!wrapper->raw->{{ field.name }}) {`
	`47`	`+ wrapper->raw->{{ field.name }} = ({{ field.cType }}){{ field.name }}_cppCallback;`
	`48`	`+ }`
	`49`	`+`
`46`	`50`	`wrapper->{{ field.name }} =newNanCallback(value.As<Function>());`
`47`	`51`	`}`
`48`	`52`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ void {{ cppClassName }}::ConstructFields() {`
`63`	`63`
`64`	`64`	`// Set the static method call and set the payload for this function to be`
`65`	`65`	`// the current instance`
`66`		`-this->raw->{{ field.name }} =({{ field.cType }}){{ field.name }}_cppCallback;`
	`66`	`+this->raw->{{ field.name }} =NULL;`
`67`	`67`	`this->raw->{{ fields\|payloadFor field.name }} = (void *)this;`
`68`	`68`	`this->{{ field.name }} =newNanCallback();`
`69`	`69`	`{% elsif field.payloadFor %}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ describe("Diff", function() {`
`85`	`85`	`assert.equal(lines[4].contentLen(),162);`
`86`	`86`	`});`
`87`	`87`
`88`		`-it.only("can diff the workdir with index",function(){`
	`88`	`+it("can diff the workdir with index",function(){`
`89`	`89`	`varpatches=this.workdirDiff.patches();`
`90`	`90`	`assert.equal(patches.length,1);`
`91`	`91`	`assert(patches[0].isUntracked());`

Comments

(0)