From 00d062a22919305704d637cd47aa1b30ea558a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20=C3=96qvist?= <jesper.oqvist@cs.lth.se>
Date: Fri, 15 May 2020 10:23:08 +0200
Subject: [PATCH] Update error messages and copyright dates
---
LICENSE | 2 +-
README.md | 2 +-
src/jastadd/ast/CollectionAttributes.jrag | 10 +++++-----
src/java/org/jastadd/JastAdd.java | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/LICENSE b/LICENSE
index 4af41102..d20c9c31 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2016, The JastAdd Team
+Copyright (c) 2005-2020, The JastAdd Team
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
index aec382e2..21d4877b 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ For additional contributors, see the change logs.
## License
-Copyright (c) 2005-2016, The JastAdd Team. All rights reserved.
+Copyright (c) 2005-2020, The JastAdd Team. All rights reserved.
JastAdd2 is covered by the modified BSD License. For the full license text
see the LICENSE file.
diff --git a/src/jastadd/ast/CollectionAttributes.jrag b/src/jastadd/ast/CollectionAttributes.jrag
index 28ba15e9..928c6bd5 100644
--- a/src/jastadd/ast/CollectionAttributes.jrag
+++ b/src/jastadd/ast/CollectionAttributes.jrag
@@ -283,7 +283,7 @@ aspect CollectionAttributes {
CollDecl decl = grammar.lookupCollDecl(collHost, collName);
if (decl == null) {
throw new Error(String.format(
- "%s:%d: Can not add custom survey code for unknown collection attribute: %s.%s()",
+ "%s:%d: Cannot add custom survey code for unknown collection attribute: %s.%s()",
fileName, startLine, collHost, collName));
}
return decl;
@@ -593,7 +593,7 @@ aspect CollectionAttributes {
// TODO(joqvist): defer collection attribute weaving.
((TypeDecl) c).addCollDecl(decl);
} else {
- errorf("Can not add collection attribute %s %s to unknown class %s in %s at line %d",
+ errorf("Cannot add collection attribute %s %s to unknown class %s in %s at line %d",
type, name, className, fileName, startLine);
}
}
@@ -651,7 +651,7 @@ aspect CollectionAttributes {
errorf("annotation %s not allowed for custom survey blocks.", annotation);
}
} else {
- errorf("Can not add custom collection survey code to unknown class %s in %s at line %d",
+ errorf("Cannot add custom collection survey code to unknown class %s in %s at line %d",
nodeType, fileName, startLine);
}
}
@@ -685,7 +685,7 @@ aspect CollectionAttributes {
errorf("annotation %s not allowed for custom survey blocks.", annotation);
}
} else {
- errorf("Can not add custom collection survey code to unknown class %s in %s at line %d",
+ errorf("Cannot add custom collection survey code to unknown class %s in %s at line %d",
nodeType, fileName, startLine);
}
}
@@ -721,7 +721,7 @@ aspect CollectionAttributes {
((ASTDecl) type).addCollEq(equ);
return equ;
} else {
- errorf("Can not add collection contribution to unknown class %s in %s at line %d",
+ errorf("Cannot add collection contribution to unknown class %s in %s at line %d",
nodeType, fileName, startLine);
// TODO(joqvist): defer weaving so we can return non-null.
return null;
diff --git a/src/java/org/jastadd/JastAdd.java b/src/java/org/jastadd/JastAdd.java
index a0c526d6..bb0cc2e8 100644
--- a/src/java/org/jastadd/JastAdd.java
+++ b/src/java/org/jastadd/JastAdd.java
@@ -139,7 +139,7 @@ public class JastAdd {
if (config.shouldPrintVersion()) {
out.println(getVersionString());
out.println(getBuildTimestamp());
- out.println("Copyright (c) 2005-2015, The JastAdd Team. All rights reserved.");
+ out.println("Copyright (c) 2005-2020, The JastAdd Team. All rights reserved.");
out.println("This software is covered by the modified BSD license.");
return 0;
} else if (config.shouldPrintHelp()) {
--
GitLab