Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
PATCH: zcalc tweaks
- X-seq: zsh-workers 38783
- From: Peter Stephenson <p.stephenson@xxxxxxxxxxx>
- To: Zsh Hackers' List <zsh-workers@xxxxxxx>
- Subject: PATCH: zcalc tweaks
- Date: Mon, 04 Jul 2016 11:37:23 +0100
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
- Organization: Samsung Cambridge Solution Centre
Update to the previous set --- decided these were more obvious and
useful ways of interacting with variables.
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index f1208e8..d4a4538 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -3829,16 +3829,24 @@ the stack to be duplicated onto the stack.
)
item(tt(pop))(
The pseudo-function tt(pop) causes the most recent element of
-the stack to be popped. A `tt(<)' on its own has the same effect.
+the stack to be popped. A `tt(>)' on its own has the same effect.
+)
+item(tt(>)var(ident))(
+The expression tt(>) followed (with no space) by a shell identifier
+causes the most recent element of the stack to be popped and
+assigned to the variable with that name. The variable is
+local to the tt(zcalc) function.
)
item(tt(<)var(ident))(
The expression tt(<) followed (with no space) by a shell identifier
-causes the most recent element of the stack to be popped and
-assigned to the identifier.
+causes the value of the variable with that name to be pushed
+onto the stack. var(ident) may be an integer, in which
+case the previous result with that number (as shown before
+the tt(>) in th standard standard tt(zcalc) prompt) is put on the stack.
)
item(Exchange: tt(xy))(
The pseudo-function tt(xy) causes the most recent two elements of
-the stack to be exchanged.
+the stack to be exchanged. `tt(<>)' has the same effect.
)
enditem()
diff --git a/Functions/Misc/zcalc b/Functions/Misc/zcalc
index 86b1e4a..4803733 100644
--- a/Functions/Misc/zcalc
+++ b/Functions/Misc/zcalc
@@ -94,7 +94,7 @@
# sequentially just as if read automatically.
emulate -L zsh
-setopt extendedglob
+setopt extendedglob typesetsilent
zcalc_show_value() {
if [[ -n $_base ]]; then
@@ -301,7 +301,7 @@ while (( _expression_mode )) ||
;;
((:|)local([[:blank:]]##*|))
- eval $_line
+ eval ${_line##:}
_line=
continue
;;
@@ -333,7 +333,11 @@ while (( _expression_mode )) ||
_push=1
_matched=1
case $_line in
- (\=|pop|\<[[:IDENT:]]#)
+ (\<[[:IDENT:]]##)
+ ans=${(P)${_line##\<}}
+ ;;
+
+ (\=|pop|\>[[:IDENT:]]#)
if (( ${#stack} < 1 )); then
print -r -- "${_line}: not enough values on stack" >&2
_line=
@@ -343,12 +347,18 @@ while (( _expression_mode )) ||
(=)
ans=${stack[1]}
;;
- (pop|\<)
+ (pop|\>)
_push=0
shift stack
;;
- (\<[[:IDENT:]]##)
- (( ${_line##\<} = ${stack[1]} ))
+ (\>[[:IDENT:]]##)
+ if [[ ${_line##\>} = (_*|stack|ans|PI|E) ]]; then
+ print "${_line##\>}: reserved variable" >&2
+ _line=
+ continue
+ fi
+ local ${_line##\>}
+ (( ${_line##\>} = ${stack[1]} ))
_push=0
shift stack
;;
@@ -371,14 +381,14 @@ while (( _expression_mode )) ||
shift 2 stack
;;
- (ldexp|jn|yn|scalb|xy)
+ (ldexp|jn|yn|scalb|xy|\<\>)
# Functions with two arguments
if (( ${#stack} < 2 )); then
print -r -- "${_line}: not enough values on stack" >&2
_line=
continue
fi
- if [[ $_line = xy ]]; then
+ if [[ $_line = (xy|\<\>) ]]; then
_tmp=${stack[1]}
stack[1]=${stack[2]}
stack[2]=$_tmp
Messages sorted by:
Reverse Date,
Date,
Thread,
Author