flynx/diff.js
1
0
Fork 0
mirror of https://github.com/flynx/diff.js.git synced 2025-10-29 02:50:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor refactoring...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2018-09-05 17:02:04 +03:00
parent ce87f0bfe0
commit 5401527969
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
diff.js
View File

@ -261,8 +261,9 @@ var proxy = function(path, func){
// //
// XXX add use-case docs... // XXX add use-case docs...
// XXX need to avoid recursion... // XXX need to avoid recursion...
// XXX should we avoid backtracking when pattern matching??? // XXX Q: should we avoid backtracking when pattern matching???
// ...specifically when working with IN and OF... // ...specifically when working with IN and OF...
// A: if possible yes...
// XXX diffing a mismatching pattern should yield the exact position // XXX diffing a mismatching pattern should yield the exact position
// (sub-pattern/rule) that failed and not just the whole pattern... // (sub-pattern/rule) that failed and not just the whole pattern...
// ...usually a pattern chain fails, i.e. the nested failing pattern // ...usually a pattern chain fails, i.e. the nested failing pattern
@ -278,6 +279,9 @@ var LogicTypeClassPrototype = {
var LogicTypePrototype = { var LogicTypePrototype = {
__context__: null, __context__: null,
// Create a context instance...
//
// This instance holds the context .cache and .ns
context: function(context){ context: function(context){
var res = (this.__context__ == null || context != null) ? var res = (this.__context__ == null || context != null) ?
Object.create(this) Object.create(this)
@ -289,19 +293,23 @@ var LogicTypePrototype = {
__cmp__: function(obj, cmp, context){ __cmp__: function(obj, cmp, context){
return false }, return false },
// //
// Deep compare this to obj (use Diff.cmp(..))... // Deep compare this to obj...
// .cmp(obj) // .cmp(obj)
// -> bool // -> bool
// //
// Deep compare this to obj in context (use Diff.cmp(..))... // Deep compare this to obj in context...
// .cmp(obj, context) // .cmp(obj, context)
// -> bool // -> bool
// //
// Compare this to obj using comparator cmp and an optional context context... // Compare this to obj using comparator cmp and an optional context...
// .cmp(obj, cmp) // .cmp(obj, cmp)
// .cmp(obj, cmp, context) // .cmp(obj, cmp, context)
// -> bool // -> bool
// //
//
// The cases where a cmp function is not provided this uses
// Diff.cmp(..) as a basis...
//
// XXX need to track loops... // XXX need to track loops...
// XXX HACK???: this uses Diff.cmp(..) in simple cases... // XXX HACK???: this uses Diff.cmp(..) in simple cases...
cmp: function(obj, cmp, context){ cmp: function(obj, cmp, context){
@ -527,7 +535,7 @@ module.ARRAY =
// Will compare as true to anything but .value... // Will compare as true to anything but .value...
var NOT = var NOT =
module.NOT = module.NOT =
object.makeConstructor('NOT', Object.assign(new LogicType(), { object.makeConstructor('NOT', Object.assign(Object.create(LogicType.prototype), {
__cmp__: function(obj, cmp, context){ __cmp__: function(obj, cmp, context){
return !cmp(this.value, obj, context) }, return !cmp(this.value, obj, context) },
__init__: function(value){ __init__: function(value){
@ -539,7 +547,7 @@ object.makeConstructor('NOT', Object.assign(new LogicType(), {
// Will compare as true if one of the .members compares as true... // Will compare as true if one of the .members compares as true...
var OR = var OR =
module.OR = module.OR =
object.makeConstructor('OR', Object.assign(new LogicType(), { object.makeConstructor('OR', Object.assign(Object.create(LogicType.prototype), {
__cmp__: function(obj, cmp, context){ __cmp__: function(obj, cmp, context){
for(var m of this.members){ for(var m of this.members){
if(cmp(m, obj, context)){ if(cmp(m, obj, context)){
@ -557,7 +565,7 @@ object.makeConstructor('OR', Object.assign(new LogicType(), {
// Will compare as true if all of the .members compare as true... // Will compare as true if all of the .members compare as true...
var AND = var AND =
module.AND = module.AND =
object.makeConstructor('AND', Object.assign(new LogicType(), { object.makeConstructor('AND', Object.assign(Object.create(LogicType.prototype), {
__cmp__: function(obj, cmp, context){ __cmp__: function(obj, cmp, context){
for(var m of this.members){ for(var m of this.members){
if(!cmp(m, obj, context)){ if(!cmp(m, obj, context)){
@ -578,7 +586,7 @@ object.makeConstructor('AND', Object.assign(new LogicType(), {
// -> false // -> false
var CONTEXT = var CONTEXT =
module.CONTEXT = module.CONTEXT =
object.makeConstructor('CONTEX', Object.assign(new LogicType(), { object.makeConstructor('CONTEXT', Object.assign(Object.create(LogicType.prototype), {
__cmp__: function(obj, cmp, context){ __cmp__: function(obj, cmp, context){
return cmp(this.pattern, obj) }, return cmp(this.pattern, obj) },
__init__: function(pattern){ __init__: function(pattern){
@ -589,7 +597,7 @@ object.makeConstructor('CONTEX', Object.assign(new LogicType(), {
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
var VAR = var VAR =
module.VAR = module.VAR =
object.makeConstructor('VAR', Object.assign(new LogicType(), { object.makeConstructor('VAR', Object.assign(Object.create(LogicType.prototype), {
__cmp__: function(obj, cmp, context){ __cmp__: function(obj, cmp, context){
var context = context || this.context().__context__ var context = context || this.context().__context__
var ns = context.ns = context.ns || {} var ns = context.ns = context.ns || {}
@ -615,7 +623,7 @@ object.makeConstructor('VAR', Object.assign(new LogicType(), {
// this is like VAR(..) but will do a structural compare... // this is like VAR(..) but will do a structural compare...
var LIKE = var LIKE =
module.LIKE = module.LIKE =
object.makeConstructor('LIKE', Object.assign(new VAR(), { object.makeConstructor('LIKE', Object.assign(Object.create(VAR.prototype), {
__cmp__: function(obj, cmp, context){ __cmp__: function(obj, cmp, context){
var context = context || this.context().__context__ var context = context || this.context().__context__
@ -632,7 +640,7 @@ object.makeConstructor('LIKE', Object.assign(new VAR(), {
// TEST(func) == L iff func(L) is true. // TEST(func) == L iff func(L) is true.
var TEST = var TEST =
module.TEST = module.TEST =
object.makeConstructor('TEST', Object.assign(new VAR(), { object.makeConstructor('TEST', Object.assign(Object.create(LogicType.prototype), {
__cmp__: function(obj, cmp, context){ __cmp__: function(obj, cmp, context){
return this.func(obj, cmp, context) }, return this.func(obj, cmp, context) },
__init__: function(func){ __init__: function(func){
@ -648,7 +656,7 @@ object.makeConstructor('TEST', Object.assign(new VAR(), {
// large containers... // large containers...
var IN = var IN =
module.IN = module.IN =
object.makeConstructor('IN', Object.assign(new LogicType(), { object.makeConstructor('IN', Object.assign(Object.create(LogicType.prototype), {
// XXX make this a break-on-match and not a go-through-the-whole-thing // XXX make this a break-on-match and not a go-through-the-whole-thing
// XXX should we check inherited stuff??? // XXX should we check inherited stuff???
__cmp__: function(obj, cmp, context){ __cmp__: function(obj, cmp, context){
@ -680,7 +688,7 @@ object.makeConstructor('IN', Object.assign(new LogicType(), {
// a recursive pattern... // a recursive pattern...
var AT = var AT =
module.AT = module.AT =
object.makeConstructor('AT', Object.assign(new LogicType(), { object.makeConstructor('AT', Object.assign(Object.create(LogicType.prototype), {
__cmp__: function(obj, cmp, context){ __cmp__: function(obj, cmp, context){
if(cmp(obj != null ? obj[this.key] : null, this.value, context)){ if(cmp(obj != null ? obj[this.key] : null, this.value, context)){
return true return true
@ -699,7 +707,7 @@ object.makeConstructor('AT', Object.assign(new LogicType(), {
// on matching... // on matching...
var OF = var OF =
module.OF = module.OF =
object.makeConstructor('OF', Object.assign(new LogicType(), { object.makeConstructor('OF', Object.assign(Object.create(LogicType.prototype), {
__cmp__: function(obj, cmp){ __cmp__: function(obj, cmp){
// XXX // XXX
}, },