Skip to content

Commit

Permalink
3.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
stevenmeker committed Apr 13, 2023
1 parent e6a939f commit 5cf2015
Show file tree
Hide file tree
Showing 84 changed files with 912 additions and 301 deletions.
16 changes: 15 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
2023-04-13 Steven Eker <eker@pup>

* tests/Corner/attributeOverparsing.maude: added latex examples

2023-04-11 Steven Eker <eker@pup>

* tests/Corner/attributeOverparsing.maude: added

* tests/Corner/fakeParameterConstant.maude: added

* tests/Corner/fakeParameterSort.maude: added

===================================Maude144===========================================

2023-04-10 Steven Eker <eker@pup>

* tests/ResolvedBugs/pseudoParameterTheoryConstantMarch2023.maude: created
* tests/ResolvedBugs/pseudoParameterTheoryConstantMarch2023.maude: added

* tests/ResolvedBugs/pseudoParametersMarch2023.maude: added

Expand Down
14 changes: 11 additions & 3 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
Overview of Changes in alpha144
Overview of Changes in Maude 3.3.1 (alpha145) (2023-04-13)
==========================================================
* fixed a bug where internal error and stack overflow messages
didn't appear on Macs by not stripping Mac binary
* overparsing for attributes with missing information in operator
declarations and mappings

Overview of Changes in alpha144 (2023-04-10)
============================================
* fixed a bug where special symbols other than strings that
started with " were not recognized.
* fixed a bug where renamings that mapped parameterized constants
were not being correctly instantiated
* fixed a bug where operator with the same name but different
* fixed a bug where operators with the same name but different
arities could confuse renamings generated to instantiate modules
* fixed a bug where a change of parameter was not supported for
parameterized polymorpic constants
parameterized polymorphic constants
* fixed a large family of bugs where identifiers that looked
like parameters but which were not ("pseudo parameters") could
clash with actual parameters by enforcing new constraints
* fixed a bug where a constant from a parameter theory that
looked like a parameterized constant was being treated as such
for various operations
* different message for self-check failure

Overview of Changes in Maude 3.3 (alpha143) (2023-03-22)
========================================================
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ Rewriting logic is a logic of concurrent change that can naturally deal with sta
Maude supports in a systematic and efficient way logical reflection. This makes Maude remarkably extensible and powerful, supports an extensible algebra of module composition operations, and allows many advanced metaprogramming and metalanguage applications. Indeed, some of the most interesting applications of Maude are metalanguage applications, in which Maude is used to create executable environments for different logics, theorem provers, languages, and models of computation.


## Maude 3.3.1

* Restrictions on pseudo-parameters
* More overparsing
* Many bug fixes

## Maude 3.3

* Support for object-oriented syntactic sugar (omods/oths)
Expand Down
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for Maude alpha144.
# Generated by GNU Autoconf 2.69 for Maude 3.3.1.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Maude'
PACKAGE_TARNAME='maude'
PACKAGE_VERSION='alpha144'
PACKAGE_STRING='Maude alpha144'
PACKAGE_VERSION='3.3.1'
PACKAGE_STRING='Maude 3.3.1'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1312,7 +1312,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures Maude alpha144 to adapt to many kinds of systems.
\`configure' configures Maude 3.3.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1383,7 +1383,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Maude alpha144:";;
short | recursive ) echo "Configuration of Maude 3.3.1:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1490,7 +1490,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Maude configure alpha144
Maude configure 3.3.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2013,7 +2013,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by Maude $as_me alpha144, which was
It was created by Maude $as_me 3.3.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -2962,7 +2962,7 @@ fi

# Define the identity of the package.
PACKAGE='maude'
VERSION='alpha144'
VERSION='3.3.1'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -6623,7 +6623,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by Maude $as_me alpha144, which was
This file was extended by Maude $as_me 3.3.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -6689,7 +6689,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
Maude config.status alpha144
Maude config.status 3.3.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Initialize autoconf stuff.
#
AC_INIT(Maude, alpha144, [[email protected]])
AC_INIT(Maude, 3.3.1, [[email protected]])
#
# Allow directory names that look like macros.
#
Expand Down
3 changes: 2 additions & 1 deletion doc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ EXTRA_DIST = \
alpha141.txt \
alpha142.txt \
alpha143.txt \
alpha144.txt
alpha144.txt \
alpha145.txt
3 changes: 2 additions & 1 deletion doc/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,8 @@ EXTRA_DIST = \
alpha141.txt \
alpha142.txt \
alpha143.txt \
alpha144.txt
alpha144.txt \
alpha145.txt

all: all-am

Expand Down
27 changes: 27 additions & 0 deletions doc/alpha145.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Alpha 145 release notes
========================

Bug fix
========

A bug where internal error and stack overflow messages were being
lost on Macs. This seems to be due to stripped binaries so the Mac binary
is no longer stripped.

Other changes
==============

(1) Overparsing for prec/gather/format/strat/strategy/poly attributes
without their needed information in operator declarations. For example:

fmod FOO is
op _+_ : Bool Bool -> Bool [prec gather format strat strategy poly] .
endfm


(2) Overparsing for prec/gather/format attributes without their needed
information in operator mappings. For example:

fmod FOO is
inc NAT * (op _+_ to _++_ [format prec gather]) .
endfm
10 changes: 5 additions & 5 deletions src/ACU_Theory/ACU_LhsAutomaton.hh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
This file is part of the Maude 3 interpreter.
Copyright 1997-2003 SRI International, Menlo Park, CA 94025, USA.
Copyright 1997-2023 SRI International, Menlo Park, CA 94025, USA.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -244,10 +244,10 @@ private:
ACU_ExtensionInfo* extensionInfo);

ACU_Symbol* const topSymbol;
const Bool matchAtTop;
const Bool collapsePossible;
Bool treeMatchOK;
Bool collectorSeen;
const bool matchAtTop;
const bool collapsePossible;
bool treeMatchOK;
bool collectorSeen;
MatchStrategy matchStrategy;
int totalLowerBound; // must have at least this total mutiplicity of subjects
int totalUpperBound; // can't have more than this total mutiplicity of subjects
Expand Down
6 changes: 3 additions & 3 deletions src/ACU_Theory/ACU_LhsCompiler1.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
This file is part of the Maude 3 interpreter.
Copyright 1997-2003 SRI International, Menlo Park, CA 94025, USA.
Copyright 1997-2023 SRI International, Menlo Park, CA 94025, USA.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -77,14 +77,14 @@ ACU_Term::analyseConstraintPropagation(NatSet& boundUniquely) const
}
if (lastUnboundVariable != UNDEFINED)
{
Assert(nonGroundAliens.size() == 0, "ACU_Term::analyseConstraintPropagation() : shouldn't have NGAs");
Assert(nonGroundAliens.empty(), "ACU_Term::analyseConstraintPropagation() : shouldn't have NGAs");
//
// If the only thing that doesn't ground out is a variable we can
// bind it uniquely.
//
boundUniquely.insert(lastUnboundVariable);
}
else if (nonGroundAliens.length() != 0)
else if (!nonGroundAliens.empty())
{
//
// If the only things that don't ground out are NGAs we can choose a
Expand Down
6 changes: 3 additions & 3 deletions src/ACU_Theory/ACU_NonLinearLhsAutomaton.hh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
This file is part of the Maude 3 interpreter.
Copyright 1997-2003 SRI International, Menlo Park, CA 94025, USA.
Copyright 1997-2023 SRI International, Menlo Park, CA 94025, USA.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -59,8 +59,8 @@ private:
const int varIndex;
const int multiplicity;
Sort* const varSort;
const Bool unitSort;
const Bool pureSort;
const bool unitSort;
const bool pureSort;
};

#endif
6 changes: 3 additions & 3 deletions src/ACU_Theory/ACU_Term.hh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
This file is part of the Maude 3 interpreter.
Copyright 1997-2003 SRI International, Menlo Park, CA 94025, USA.
Copyright 1997-2023 SRI International, Menlo Park, CA 94025, USA.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -77,8 +77,8 @@ private:
Term* term;
int multiplicity;
short abstractionVariableIndex; // if subterm could enter our theory we abstract it
Bool collapseToOurSymbol; // first possible reason for variable abstraction
Bool matchOurIdentity; // second possible reason for variable abstraction
bool collapseToOurSymbol; // first possible reason for variable abstraction
bool matchOurIdentity; // second possible reason for variable abstraction
};

struct CP_Sequence;
Expand Down
16 changes: 16 additions & 0 deletions src/ACU_Theory/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
2023-04-13 Steven Eker <eker@pup>

* ACU_LhsCompiler1.cc (ACU_Term::analyseConstraintPropagation): use
empty() (2 places)

2023-04-12 Steven Eker <eker@pup>

* ACU_LhsAutomaton.hh (class ACU_LhsAutomaton): Bool -> bool

* ACU_Term.hh (class ACU_Term): Bool -> bool

* ACU_NonLinearLhsAutomaton.hh (class ACU_NonLinearLhsAutomaton):
Bool -> bool

===================================Maude145===========================================

2023-03-27 Steven Eker <eker@pup>

* ACU_RhsAutomaton.cc (ACU_RhsAutomaton::ACU_RhsAutomaton): use
Expand Down
12 changes: 6 additions & 6 deletions src/AU_Theory/AU_Layer.hh
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ private:
//
// For solve-time use
//
Bool boundByUs;
Bool extraId;
bool boundByUs;
bool extraId;
};

struct Node
Expand All @@ -77,10 +77,10 @@ private:

const AU_DagNode* subject;
int lastSubjectSubterm; // index of last subterm in subject
Bool oneSidedId; // true if subject has a one sided identity
Bool leftId; // true if subject has left identity only
Bool leftExtend; // have left extension before variable block
Bool rightExtend; // have right extension after variable block
bool oneSidedId; // true if subject has a one sided identity
bool leftId; // true if subject has left identity only
bool leftExtend; // have left extension before variable block
bool rightExtend; // have right extension after variable block
int totalLowerBound; // sum of lowerBounds for prevVariables
int totalUpperBound; // sum of upperBounds for prevVariables + extension
AU_ExtensionInfo* extensionInfo; // for layers with leftExtend/rightExtend only
Expand Down
6 changes: 3 additions & 3 deletions src/AU_Theory/AU_LhsAutomaton.hh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
This file is part of the Maude 3 interpreter.
Copyright 1997-2003 SRI International, Menlo Park, CA 94025, USA.
Copyright 1997-2023 SRI International, Menlo Park, CA 94025, USA.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -118,8 +118,8 @@ private:
struct TopVariable
{
short index;
Bool takeIdentity; // take identity instead of piece of subject (always)
Bool awkward; // take identity instead of piece of subject (special)
bool takeIdentity; // take identity instead of piece of subject (always)
bool awkward; // take identity instead of piece of subject (special)
Sort* sort;
int upperBound;
LhsAutomaton* abstracted; // automaton for abstracted term
Expand Down
Loading

0 comments on commit 5cf2015

Please sign in to comment.