zorba-coders team mailing list archive

["Paul J. Lucas" <paul@xxxxxxxxxxxxx>]

Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.

Requested reviews:
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/120491

QueryLoc clean-up:
1. Added all-argument constructor (needed for LLVM).
2. Removed pointless copy constructor since default is fine.
3. Removed pointless virtual destructor (there are no virtual functions!).
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/120491
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/compiler/parser/query_loc.cpp'
--- src/compiler/parser/query_loc.cpp	2012-08-16 18:31:02 +0000
+++ src/compiler/parser/query_loc.cpp	2012-08-21 01:27:34 +0000
@@ -37,13 +37,14 @@
 }
 
 
-QueryLoc::QueryLoc(const QueryLoc& aQueryLoc) 
- :
-  theFilename(aQueryLoc.theFilename),
-  theLineBegin (aQueryLoc.theLineBegin),
-  theColumnBegin (aQueryLoc.theColumnBegin),
-  theLineEnd (aQueryLoc.theLineEnd),
-  theColumnEnd (aQueryLoc.theColumnEnd)
+QueryLoc::QueryLoc( zstring const &filename, unsigned lineBegin,
+                    unsigned lineEnd, unsigned columnBegin,
+                    unsigned columnEnd ) :
+  theFilename(filename),
+  theLineBegin(lineBegin),
+  theColumnBegin(lineEnd),
+  theLineEnd(columnBegin),
+  theColumnEnd(columnEnd)
 {
 }
 

=== modified file 'src/compiler/parser/query_loc.h'
--- src/compiler/parser/query_loc.h	2012-08-16 18:31:02 +0000
+++ src/compiler/parser/query_loc.h	2012-08-21 01:27:34 +0000
@@ -49,9 +49,8 @@
 public:
   QueryLoc();
 
-  QueryLoc(const QueryLoc& aQueryLoc);
-
-  virtual ~QueryLoc() {}
+  QueryLoc( zstring const &filename, unsigned lineBegin, unsigned lineEnd,
+            unsigned columnBegin = 0, unsigned columnEnd = 0 );
 
 public:
   const zstring& getFilename() const { return theFilename; }