Skip to content

Commit f24f396

Browse files
committedAug 4, 2015
yacas r3216 (ba2a4f8). Ablauf edited.
1 parent 7c507e0 commit f24f396

15 files changed

+5038
-45
lines changed
 

‎Ablauf.md

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Ablauf
2+
3+
### Fetch the current scripts and JavaYacas sources
4+
5+
cd yacas:
6+
7+
ant clean
8+
(rm -r build)
9+
(rm -r dist)
10+
(rm JavaYacas/CVersion.java)
11+
12+
cd JavaYacas
13+
svn update
14+
cd ../scripts
15+
svn update
16+
17+
**Versionsnummer** (svn) **notieren**. Git commit Nr. von Webseite holen.
18+
19+
### Rebuild the jar
20+
21+
*build.xml*: Version (svn commit Nr.) **anpassen**!
22+
23+
24+
Kontrollieren, dass in scripts diese Dateien gelöscht sind: *Makefile.am*, *maketest*
25+
26+
Kontrollieren, dass in JavaYacas diese Dateien gelöscht sind:
27+
alle ausser CVersion.java.in (also auch CVersion.java löschen, wird durch ant neu generiert)
28+
29+
Kontrollieren, dass in JavaYacas das Verzeichnis gelöscht ist: *lib*
30+
31+
cd ..
32+
33+
ant
34+
(äquivalent zu ant jar)
35+
36+
### Create the corresponding source archive
37+
38+
cd ..
39+
in dotar allenfalls die Versionsnummer **anpassen**!
40+
41+
./dotar
42+
(oder
43+
tar -czf dist/yacas-1.3.6+.tar.gz --exclude=.svn yacas/scripts yacas/JavaYacas yacas/build.xml yacas/COPYING
44+
)
45+
46+
47+
# GitHub
48+
49+
### Commit
50+
51+
Version (svn commit Nr. / git commit nr) **anpassen**!
52+
53+
git commit -a -m 'yacas r3216 (ba2a4f8)'
54+
55+
git push origin master
56+

‎Ablauf.txt

-29
This file was deleted.

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Building JavaYacas (https://github.com/grzegorzmazur/yacas). To get executable j
55
Get the last built executable *yacas.jar* from the directory *dist*.
66

77
## Rebuild the executable jar and source tar.gz ##
8-
See Ablauf.txt
8+
See Ablauf.md
99

1010
- Fetches the current scripts and JavaYacas sources from the yacas repository (https://github.com/grzegorzmazur/yacas). Uses subversion (svn).
1111
- Rebuilds the jar.

‎dist/yacas-1.3.6+.tar.gz

165 Bytes
Binary file not shown.

‎dist/yacas.jar

620 Bytes
Binary file not shown.

‎yacas/JavaYacas/.svn/pristine/a9/a9522f02c049567f8350a07066909c16b37a0052.svn-base

+4,320
Large diffs are not rendered by default.

‎yacas/JavaYacas/.svn/wc.db

4 KB
Binary file not shown.

‎yacas/JavaYacas/CVersion.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package net.sf.yacas;
22

33
class CVersion {
4-
static String VERSION = "1.3.6+ (svn r3197)";
4+
static String VERSION = "1.3.6+ (svn r3216)";
55
}

‎yacas/JavaYacas/net/sf/yacas/MathCommands.java

+12-1
Original file line numberDiff line numberDiff line change
@@ -572,10 +572,12 @@ public void AddCommands(LispEnvironment aEnvironment)
572572
aEnvironment.CoreCommands().put(
573573
"DebugLine",
574574
new YacasEvaluator(new LispDebugLine(),1, YacasEvaluator.Fixed|YacasEvaluator.Function));
575+
aEnvironment.CoreCommands().put(
576+
"Interpreter",
577+
new YacasEvaluator(new LispInterpreter(),0, YacasEvaluator.Fixed|YacasEvaluator.Function));
575578
aEnvironment.CoreCommands().put(
576579
"Version",
577580
new YacasEvaluator(new LispVersion(),0, YacasEvaluator.Fixed|YacasEvaluator.Function));
578-
579581
aEnvironment.CoreCommands().put(
580582
"Exit",
581583
new YacasEvaluator(new LispExit(),0, YacasEvaluator.Fixed|YacasEvaluator.Function));
@@ -4192,6 +4194,15 @@ public void Eval(LispEnvironment aEnvironment,int aStackTop) throws Exception
41924194
}
41934195
}
41944196

4197+
class LispInterpreter extends YacasEvalCaller
4198+
{
4199+
@Override
4200+
public void Eval(LispEnvironment aEnvironment,int aStackTop) throws Exception
4201+
{
4202+
RESULT(aEnvironment,aStackTop).Set(LispAtom.New(aEnvironment,"\"jyacas\""));
4203+
}
4204+
}
4205+
41954206
class LispVersion extends YacasEvalCaller
41964207
{
41974208
@Override

‎yacas/build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<description>
33
JavaYacas build file
44
</description>
5-
<property name="version" value="1.3.6+ (svn r3197)" />
5+
<property name="version" value="1.3.6+ (svn r3216)" />
66
<property name="default.javac.source" value="1.6"/>
77
<property name="default.javac.target" value="1.6"/>
88
<property name="main" value="net.sf.yacas.YacasConsole" />

‎yacas/scripts/.svn/pristine/3b/3b2fb32214ce16105104dc811e3783473976b233.svn-base

+636
Large diffs are not rendered by default.

‎yacas/scripts/.svn/wc.db

1 KB
Binary file not shown.

‎yacas/scripts/lists.rep/code.ys

+11-12
Original file line numberDiff line numberDiff line change
@@ -443,27 +443,26 @@ Macro("MacroMapArgs",{expr,oper})
443443
UnFence("MapArgs",2);
444444
HoldArg("MapArgs",oper);
445445

446+
10 # DeepCopy(l_IsList) <-- [
447+
Local(r);
448+
r := {};
449+
ForEach(e, l)
450+
DestructiveAppend(r, DeepCopy(e));
451+
r;
452+
];
446453

447-
10 # FillList(_item, 0) <-- {};
454+
20 # DeepCopy(_e) <-- e;
448455

449-
20 # FillList(item_IsList, length_IsPositiveInteger) <-- [
450-
Local(i, n, result);
451-
result := {};
452-
n := Length(item);
453-
For(i:=0, i < length, i++)
454-
DestructiveInsert(result, 1, Take(item, n));
455-
result;
456-
];
456+
10 # FillList(_item, 0) <-- {};
457457

458-
30 # FillList(_item, length_IsPositiveInteger) <-- [
458+
20 # FillList(_item, length_IsPositiveInteger) <-- [
459459
Local(i, result);
460460
result := {};
461461
For(i:=0, i < length, i++)
462-
DestructiveInsert(result, 1, item);
462+
DestructiveInsert(result, 1, DeepCopy(item));
463463
result;
464464
];
465465

466-
467466
/* ***** Drop ***** */
468467

469468
/* Needs to check the parameters */

0 commit comments

Comments
 (0)
Please sign in to comment.