From 091643ea85e746421be6fd0c168744fc75d16df2 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (office)" <j.wuttke@fz-juelich.de>
Date: Tue, 10 Jan 2012 16:38:19 +0100
Subject: [PATCH] 'dirac' -> 'resol'
---
pub/CHANGELOG | 2 ++
pub/src/expr.cpp | 4 ++--
pub/src/xax_lex.lpp | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pub/CHANGELOG b/pub/CHANGELOG
index 9d3c8452..a8438d18 100644
--- a/pub/CHANGELOG
+++ b/pub/CHANGELOG
@@ -1,5 +1,7 @@
Release 2.1.4c of
+- user interface changes:
+ - 'resol' instead of 'dirac'
- improved behavior:
- improve curve refinement, especially for log axes (close_enough)
- bugfixes:
diff --git a/pub/src/expr.cpp b/pub/src/expr.cpp
index 845adc70..b0fc388b 100644
--- a/pub/src/expr.cpp
+++ b/pub/src/expr.cpp
@@ -574,7 +574,7 @@ void CTree::set_coord( CCoord& ret, uint k ) const
arg[0]->set_coord( ret, k );
break;
case _DIRAC:
- ret = CCoord("dirac", "");
+ ret = CCoord("resol", "");
break;
case _VAL:
ret = CCoord(strg(val), "");
@@ -608,7 +608,7 @@ string CTree::tree_info() const
case _CONV:
return "conv(" + arg[0]->tree_info() + ")";
case _DIRAC:
- return "dirac(" + arg[0]->tree_info() + ")";
+ return "resol(" + arg[0]->tree_info() + ")";
case _VAL:
return "val[" + strg(val) + "]";
case _REF:
diff --git a/pub/src/xax_lex.lpp b/pub/src/xax_lex.lpp
index 3cdbef97..6512d4b1 100644
--- a/pub/src/xax_lex.lpp
+++ b/pub/src/xax_lex.lpp
@@ -96,7 +96,7 @@ e {
"over" { return BOP_OVER; } /* binomial coefficient: n over k */
"conv" { return CONV; }
-"dirac" { return DIRAC; }
+"resol" { return DIRAC; }
{ID} {
// printf( "lex: An identifier: %s\n", xaxtext );
--
GitLab