[f2j] 02/04: Fix some spelling issues, Propagate hardening options
Andreas Tille
tille at debian.org
Fri Jan 29 20:19:07 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository f2j.
commit 396554e8027276cd7a3ef2282b93a77d2f8ecb89
Author: Andreas Tille <tille at debian.org>
Date: Fri Jan 29 19:37:04 2016 +0100
Fix some spelling issues, Propagate hardening options
---
debian/changelog | 2 +
debian/patches/hardening.patch | 15 +++
debian/patches/series | 2 +
debian/patches/spelling.patch | 261 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 280 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index e0cf922..95f7fc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ f2j (0.8.1+dfsg-1) UNRELEASED; urgency=medium
* debhelper 9
* cme fix dpkg-control
* DEP5 fixes
+ * Fix some spelling issues
+ * Propagate hardening options
-- Andreas Tille <tille at debian.org> Fri, 29 Jan 2016 15:47:50 +0100
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..e75ea1e
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 29 Jan 2016 15:47:50 +0100
+Description: Propagate hardening flags
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -17,7 +17,7 @@ F2J_LIBS= -L$(BYTE_DIR) -lbytecode $(LIB
+
+ # The main executable.
+ f2java: f2j.h f2jparse.y $(OBJS) $(BYTE_DIR)/libbytecode.a
+- $(CC) $(CFLAGS) $(INCLUDES) -o $@ $(OBJS) $(F2J_LIBS)
++ $(CC) $(CFLAGS) $(INCLUDES) -o $@ $(OBJS) $(F2J_LIBS) $(LDFLAGS)
+
+ # The purify version...
+ puref2j: f2j.h f2jparse.y $(OBJS) $(JAVAB)
diff --git a/debian/patches/series b/debian/patches/series
index b003799..b3f770a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ fix_clean_target
generate_doc
remove_non-free_parts.patch
replace_printfformat.patch
+spelling.patch
+hardening.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
new file mode 100644
index 0000000..80bcc1b
--- /dev/null
+++ b/debian/patches/spelling.patch
@@ -0,0 +1,261 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 29 Jan 2016 15:47:50 +0100
+Description: Fix spelling
+
+--- a/src/f2jmain.c
++++ b/src/f2jmain.c
+@@ -144,7 +144,7 @@ to the -s.\n\n";
+ char f2java_help_d_option[] = "The -d options causes f2j\
+ to generate comments in\n\
+ a format suitable for javadoc. It is a bit of a LAPACK-\n\
+-specfic hack...the longest comment in the program unit\n\
++specific hack...the longest comment in the program unit\n\
+ is placed in the javadoc comment. It works fine for\n\
+ BLAS/LAPACK code (or any other code where the longest\n\
+ comment is the one that describes the function), but\n\
+--- a/src/f2jparse.y
++++ b/src/f2jparse.y
+@@ -3626,7 +3626,7 @@ assign_array_dims(AST *var)
+ node = hash_entry->variable;
+ else {
+ if(debug){
+- printf("Calling initalize name from assign_array_dims\n");
++ printf("Calling initialize name from assign_array_dims\n");
+ }
+
+ node = initialize_name(var->astnode.ident.name);
+--- a/src/y.tab.c
++++ b/src/y.tab.c
+@@ -6122,7 +6122,7 @@ assign_array_dims(AST *var)
+ node = hash_entry->variable;
+ else {
+ if(debug){
+- printf("Calling initalize name from assign_array_dims\n");
++ printf("Calling initialize name from assign_array_dims\n");
+ }
+
+ node = initialize_name(var->astnode.ident.name);
+--- a/src/codegen.c
++++ b/src/codegen.c
+@@ -276,7 +276,7 @@ emit (AST * root)
+ local_emit(cur_method, root->astnode.source.typedecs);
+
+ /* If this program unit does any reading, we declare an instance of
+- * the EasyIn class. grab a local var for this, but dont worry
++ * the EasyIn class. grab a local var for this, but don't worry
+ * about releasing it, since we might need it throughout the life
+ * of the method.
+ */
+@@ -1645,7 +1645,7 @@ common_emit(AST *root)
+ /* save the current global variables pointing to the class file. this is
+ * necessary because we're in the middle of generating the class file
+ * for the current fortran program unit, but now we need to generate some
+- * classes to hold COMMON blocks and we dont want to alter the pc, stack,
++ * classes to hold COMMON blocks and we don't want to alter the pc, stack,
+ * etc for the current class.
+ */
+ save_class_file = cur_class_file;
+@@ -2098,8 +2098,8 @@ is_local(AST *root){
+ hashtemp = type_lookup(cur_equiv_table,temp->astnode.ident.name);
+ if(hashtemp) {
+ if(type_lookup(cur_common_table,temp->astnode.ident.name)) {
+- fprintf(stderr,"Please dont mix COMMON and EQUIVALENCE. ");
+- fprintf(stderr,"I dont like it. It scares me.\n");
++ fprintf(stderr,"Please don't mix COMMON and EQUIVALENCE. ");
++ fprintf(stderr,"I don't like it. It scares me.\n");
+ }else {
+ fprintf(curfp," // %s equivalenced to %s\n",
+ temp->astnode.ident.name,
+@@ -2385,7 +2385,7 @@ typedec_emit_all_static (JVM_METHOD *met
+ temp->astnode.ident.name);
+
+ /*
+- * dont worry about checking the save table now since we're
++ * don't worry about checking the save table now since we're
+ * going to emit everything as static variables. --keith
+ *
+ * if(type_lookup(cur_save_table,temp->astnode.ident.name))
+@@ -2402,8 +2402,8 @@ typedec_emit_all_static (JVM_METHOD *met
+ hashtemp = type_lookup(cur_equiv_table,temp->astnode.ident.name);
+ if(hashtemp) {
+ if(type_lookup(cur_common_table,temp->astnode.ident.name)) {
+- fprintf(stderr,"Please dont mix COMMON and EQUIVALENCE. ");
+- fprintf(stderr,"I dont like it. It scares me.\n");
++ fprintf(stderr,"Please don't mix COMMON and EQUIVALENCE. ");
++ fprintf(stderr,"I don't like it. It scares me.\n");
+ } else {
+ fprintf(curfp," // %s equivalenced to %s\n",
+ temp->astnode.ident.name,
+@@ -3135,7 +3135,7 @@ data_var_emit(JVM_METHOD *meth, AST *Nte
+
+ /* check to see whether we're going to be assigning to
+ * an array element. If so, the declaration for the array
+- * would have already been emitted, so we dont need a
++ * would have already been emitted, so we don't need a
+ * declaration here - just assign the value. Otherwise,
+ * we do need a declaration.
+ * (my gut feeling is that for bytecode generation, needs_dec
+@@ -3605,7 +3605,7 @@ data_scalar_emit(JVM_METHOD *meth, enum
+ * of the string constant, otherwise some subscript operations get screwed
+ * up. so we initialize the string to n blanks, where n is the original
+ * string length.
+- * ..i dont think this code is working as described above. however, it
++ * ..i don't think this code is working as described above. however, it
+ * doesn't seem to be hurting anything currently. --kgs
+ */
+
+@@ -3720,7 +3720,7 @@ data_scalar_emit(JVM_METHOD *meth, enum
+ * *
+ * invokes the <init> method of the given class constructor. used for the *
+ * numeric & string classes (one-arg constructors). the AST node 'constant' *
+- * should represent a constant value of course (i.e. dont pass idents). *
++ * should represent a constant value of course (i.e. don't pass idents). *
+ * *
+ *****************************************************************************/
+
+@@ -3915,7 +3915,7 @@ substring_emit(JVM_METHOD *meth, AST *ro
+ * *
+ * This function emits a function call. I think this function *
+ * is only called in cases where the function or subroutine is *
+- * not declared external or intrinsic and we dont know what *
++ * not declared external or intrinsic and we don't know what *
+ * else to do with it. *
+ * *
+ *****************************************************************************/
+@@ -4003,7 +4003,7 @@ subcall_emit(JVM_METHOD *meth, AST *root
+ * the array pointed to by alist needs to have its index (dims) *
+ * decremented by one or not. This allows arrays to start *
+ * indexing at an arbitrary point. If we recognize that the *
+- * indexing starts at 0 then we dont have to decrement and we *
++ * indexing starts at 0 then we don't have to decrement and we *
+ * return FALSE. If indexing begins at 1 (the default in Fortran), *
+ * then we must decrement since Java indexing begins at 0. *
+ * *
+@@ -4019,7 +4019,7 @@ idxNeedsDecr(AST *alist)
+ {
+ if((startIdx = alist->astnode.expression.lhs) != NULL)
+ {
+- /* evaluate the start index. we dont really care about the
++ /* evaluate the start index. we don't really care about the
+ * end index at this point.
+ */
+
+@@ -4404,7 +4404,7 @@ array_emit(JVM_METHOD *meth, AST *root)
+
+ if(root->parent == NULL) {
+
+- /* Under normal circumstances, I dont think this should
++ /* Under normal circumstances, I don't think this should
+ * be reached.
+ */
+
+@@ -4708,7 +4708,7 @@ pushConst(JVM_METHOD *meth, AST *root) {
+ case DOUBLE:
+ bc_push_double_const(meth, atof(root->astnode.constant.number));
+ break;
+- case TrUE: /* dont expect to find booleans anyway, so dont try */
++ case TrUE: /* don't expect to find booleans anyway, so don't try */
+ bc_append(meth, jvm_iconst_1);
+ break;
+ case FaLSE:
+@@ -4958,7 +4958,7 @@ scalar_emit(JVM_METHOD *meth, AST *root,
+ /* General case - just generate the name, with the
+ * .val suffix if applicable. the global_sub stuff is
+ * for implied DO loops in data statements. in that
+- * case, we dont want to actually emit a variable name,
++ * case, we don't want to actually emit a variable name,
+ * so we substitute its corresponding number.
+ */
+
+@@ -6208,7 +6208,7 @@ maxmin_intrinsic_emit(JVM_METHOD *meth,
+ * method calls, where n is the number of args. For example, MAX(a,b,c,d,e)
+ * would be translated to:
+ * Math.max(Math.max(Math.max(Math.max(a,b),c),d),e)
+- * I dont think this situation is very common (in LAPACK/BLAS at least).
++ * I don't think this situation is very common (in LAPACK/BLAS at least).
+ *
+ * changed this slightly to make the inner call a three-arg Util.max call.
+ * e.g. Math.max(Math.max(Util.max(a,b,c),d),e)
+@@ -6388,7 +6388,7 @@ parenthesized_expr_emit(JVM_METHOD *meth
+ if (root->astnode.expression.parens)
+ fprintf (curfp, "(");
+
+- /* is expression.lhs ever really non-null? i dont think so.
++ /* is expression.lhs ever really non-null? i don't think so.
+ * in any case, for bytecode generation, we are not concerned
+ * with parens, so it should be ok to just call expr_emit. (kgs)
+ */
+@@ -6931,7 +6931,7 @@ relationalop_emit(JVM_METHOD *meth, AST
+ switch(cur_vt) {
+ case String:
+ case Character:
+- /* we dont need to do anything here because strings were handled
++ /* we don't need to do anything here because strings were handled
+ * above already.
+ */
+ break;
+@@ -8751,7 +8751,7 @@ formatted_read_implied_loop_sourcecode_e
+ * read_implied_loop_bytecode_emit *
+ * *
+ * This function generates code for implied DO loops contained in READ *
+- * statements. We dont handle any FORMAT statements. *
++ * statements. We don't handle any FORMAT statements. *
+ * *
+ *****************************************************************************/
+
+@@ -8803,7 +8803,7 @@ read_implied_loop_bytecode_emit(JVM_METH
+ * read_implied_loop_sourcecode_emit *
+ * *
+ * This function generates code for implied DO loops contained in READ *
+- * statements. We dont handle any FORMAT statements. *
++ * statements. We don't handle any FORMAT statements. *
+ * *
+ *****************************************************************************/
+
+@@ -10279,7 +10279,7 @@ arrayacc_arg_emit(JVM_METHOD *meth, AST
+ else /* it is not expecting an array */
+ {
+ /* In this case we are passing the array element to the
+- * adapter, so we dont wrap it in an object.
++ * adapter, so we don't wrap it in an object.
+ */
+
+ if(omitWrappers) {
+@@ -10644,7 +10644,7 @@ insert_methcall(Dlist mlist, AST *root)
+ * to pass an array element to a function that expects a scalar. If *
+ * we find such a case, we must generate an adapter that allows *
+ * pass by reference of the array element. Returns 1 if this function *
+- * call needs an adapter. If no adapter is needed or if we dont have *
++ * call needs an adapter. If no adapter is needed or if we don't have *
+ * enough info to determine whether one is needed, this function *
+ * returns 0. *
+ * *
+@@ -11085,7 +11085,7 @@ substring_assign_emit(JVM_METHOD *meth,
+ * Java's Character class doesn't have a static toString
+ * method, so we have to create a new character object first.
+ *
+- * currently I dont think we ever hit this case, so the code
++ * currently I don't think we ever hit this case, so the code
+ * here may be superfluous and is definitely untested.
+ */
+
+@@ -11290,8 +11290,8 @@ insert_adapter(AST *node)
+ if(gendebug)
+ printf("** cant find prototype...returning.\n");
+ }
+- /* cant find the prototype. normally, I dont think */
+- return; /* this case will be reached. */
++ /* cant find the prototype. normally, I don't think */
++ return; /* this case will be reached. */
+ }
+ }
+ }
+@@ -12828,7 +12828,7 @@ get_return_type_from_descriptor(char *de
+ dptr = desc;
+
+ /* skip characters until we hit the closing paren, making sure that
+- * we dont go beyond the end of hte string.
++ * we don't go beyond the end of hte string.
+ */
+
+ while(*dptr != ')') {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/f2j.git
More information about the pkg-java-commits
mailing list