From 735cd7d38fd79c96496632c24d5ff768ba564fd4 Mon Sep 17 00:00:00 2001 From: Nicolas Voirol <voirol.nicolas@gmail.com> Date: Sat, 6 Aug 2016 14:05:51 +0200 Subject: [PATCH] Some work on GrammarDataGen --- src/main/scala/inox/datagen/GrammarDataGen.scala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/scala/inox/datagen/GrammarDataGen.scala b/src/main/scala/inox/datagen/GrammarDataGen.scala index 49341f857..0318f76eb 100644 --- a/src/main/scala/inox/datagen/GrammarDataGen.scala +++ b/src/main/scala/inox/datagen/GrammarDataGen.scala @@ -13,9 +13,13 @@ import grammars._ /** Utility functions to generate values of a given type. * In fact, it could be used to generate *terms* of a given type, * e.g. by passing trees representing variables for the "bounds". */ -trait GrammarDataGen extends DataGenerator { - val evaluator: DeterministicEvaluator { val program: GrammarDataGen.program.type } - val grammar: ExpressionGrammar = ValueGrammar +trait GrammarDataGen extends DataGenerator with GrammarsUniverse { self => + val evaluator: DeterministicEvaluator { val program: self.program.type } + val grammar: ExpressionGrammar + + import program._ + import program.trees._ + import program.symbols._ // Assume e contains generic values with index 0. // Return a series of expressions with all normalized combinations of generic values. -- GitLab