From dd53d7556bba0c9b592978ecf3e290dfa5db5554 Mon Sep 17 00:00:00 2001 From: Francis Russell Date: Tue, 7 Feb 2012 18:14:11 +0000 Subject: [PATCH] Fix generated code so it compiles. --- src/ofc/generators/onetep/PPDFunctionSet.scala | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ofc/generators/onetep/PPDFunctionSet.scala b/src/ofc/generators/onetep/PPDFunctionSet.scala index a9e0b39..df0f900 100644 --- a/src/ofc/generators/onetep/PPDFunctionSet.scala +++ b/src/ofc/generators/onetep/PPDFunctionSet.scala @@ -41,9 +41,9 @@ class PPDFunctionSet(val basis : String, data : String) extends FunctionSet { val computeRanges = for (dim <- 1 to 2) yield { val tb = parent.getTightbox(names) - "call basis_lims_1d_in_ppd_in_tight("+startNames(dim)+", "+finishNames(dim)+", "+offsetNames(dim)+", &\n" + - denseIndexNames(dim)+", "+tb+"%start_ppds2, "+tb+"%finish_ppds2, &\n" + - tb+"%start_pts2, "+tb+"%finish_pts2, pub_cell%n_pt"+dim+")" + "call basis_lims_1d_in_ppd_in_tight("+startNames(dim)+", &\n"+finishNames(dim)+", &\n"+offsetNames(dim)+", &\n" + + denseIndexNames(dim)+", &\n"+tb+"%start_ppds2, &\n"+tb+"%finish_ppds2, &\n" + + tb+"%start_pts2, &\n"+tb+"%finish_pts2, pub_cell%n_pt"+dim+")" } val loopDeclaration = "do "+names(this)+"=1,"+parent.getSphere(names)+"%n_ppds_sphere" @@ -63,7 +63,9 @@ class PPDFunctionSet(val basis : String, data : String) extends FunctionSet { finishNames = (for (dim <- 0 to 2) yield names.newIdentifier("tightbox_finish_"+dim)).toList offsetNames = (for (dim <- 0 to 2) yield names.newIdentifier("tightbox_offset_"+dim)).toList ppdPoint = names.newIdentifier("fa_point") - (denseIndexNames++finishNames++offsetNames++Some(ppdPoint)).map(x => "integer :: " + x) ++ List("integer :: "+names(this)) + + val allDeclarations = denseIndexNames++startNames++finishNames++offsetNames++Some(ppdPoint) + allDeclarations.map(x => "integer :: " + x) ++ List("integer :: "+names(this)) } } -- 2.47.3