From 04102c8892ae0fa16c8d9b4f86322b90969e80b8 Mon Sep 17 00:00:00 2001 From: Adrian Thurston Date: Thu, 30 Apr 2015 16:52:19 -0400 Subject: enable the PriorInteraction test for guarded-in priors Hacked a check for guarded-in priority check. Should do this some other way, but works for now. If the technique becomes permanent we can fix. refs #53 --- src/fsmap.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/fsmap.cc b/src/fsmap.cc index 6ee2b7c5..b89fe954 100644 --- a/src/fsmap.cc +++ b/src/fsmap.cc @@ -846,13 +846,13 @@ int FsmAp::comparePrior( const PriorTable &priorTable1, const PriorTable &priorT pd2.increment(); /* Keys are the same, check priorities. */ else if ( pd1->desc->priority < pd2->desc->priority ) { - //if ( ctx->nfaTermCheck ) - // throw PriorInteraction(); + if ( pd1->desc->key >= 10000 && ctx->nfaTermCheck ) + throw PriorInteraction(); return -1; } else if ( pd1->desc->priority > pd2->desc->priority ) { - //if ( ctx->nfaTermCheck ) - // throw PriorInteraction(); + if ( pd1->desc->key >= 10000 && ctx->nfaTermCheck ) + throw PriorInteraction(); return 1; } else { -- cgit v1.2.1