diff --git a/src/latex-struct/DocIfaces.vala b/src/latex-struct/DocIfaces.vala
index a4826d7..c14360b 100644
--- a/src/latex-struct/DocIfaces.vala
+++ b/src/latex-struct/DocIfaces.vala
@@ -54,8 +54,11 @@ namespace LAview {
public virtual IDoc copy () {
var clone = create_default_instance ();
- foreach (T dociface in this)
- clone.add ((dociface as IDoc).copy ());
+ foreach (T dociface in this) {
+ var doc = dociface as IDoc;
+ assert (doc != null);
+ clone.add (doc.copy ());
+ }
return clone;
}
@@ -66,8 +69,11 @@ namespace LAview {
public virtual string generate () {
var result = new StringBuilder ();
- foreach (T dociface in this)
- result.append ((dociface as IDoc).generate ());
+ foreach (T dociface in this) {
+ var doc = dociface as IDoc;
+ assert (doc != null);
+ result.append (doc.generate ());
+ }
return result.str;
}
diff --git a/src/latex-struct/Parser.vala b/src/latex-struct/Parser.vala
index bd797e2..5c88181 100644
--- a/src/latex-struct/Parser.vala
+++ b/src/latex-struct/Parser.vala
@@ -82,7 +82,7 @@ namespace LAview {
/* back-slash counter for one-line comments */
protected uint back_slash_counter = 0;
- public Parser (Array links) {
+ protected Parser (Array links) {
/* initializing scanner links */
this.links = links;
diff --git a/src/latex-struct/Subtable.vala b/src/latex-struct/Subtable.vala
index 49e1f42..010ffd7 100644
--- a/src/latex-struct/Subtable.vala
+++ b/src/latex-struct/Subtable.vala
@@ -228,7 +228,7 @@ namespace LAview {
* @param line_style {@link Row.OpLineStyle} of the operation.
*/
public new Row remove_at (int index, Row.OpLineStyle line_style = Row.OpLineStyle.BORDER_DBLLINES) {
- if (size > 1 && 0 != line_style & Row.OpLineStyle.HBORDER) {
+ if (size > 1 && 0 != (line_style & Row.OpLineStyle.HBORDER)) {
if (index == 0)
process_border_lines (this[1], this[index], true);
else if (index == size - 1)
diff --git a/src/latex-struct/TableParser.vala b/src/latex-struct/TableParser.vala
index f9175d0..9a3bf3d 100644
--- a/src/latex-struct/TableParser.vala
+++ b/src/latex-struct/TableParser.vala
@@ -19,7 +19,7 @@ namespace LAview {
protected bool in_caption = false;
- public TableParser (Array links) {
+ protected TableParser (Array links) {
base (links);
group.append_val (new Link ({}, {}));
diff --git a/test/parse-test/ParseTest.vala b/test/parse-test/ParseTest.vala
index 1508934..5858adf 100644
--- a/test/parse-test/ParseTest.vala
+++ b/test/parse-test/ParseTest.vala
@@ -64,10 +64,15 @@ public class Main : Object {
unowned Table.Subtable subtable = null;
- if (subdoc is Table.Tabular)
- subtable = (subdoc as Table.Tabular).table;
- else
- subtable = (subdoc as Table.Longtable).table;
+ if (subdoc is Table.Tabular) {
+ var t = subdoc as Table.Tabular;
+ assert (t != null);
+ subtable = t.table;
+ } else {
+ var t = subdoc as Table.Longtable;
+ assert (t != null);
+ subtable = t.table;
+ }
foreach (var row in subtable) {
foreach (var cell in row) {