Merge pull request RustPython#1093 from RustPython/getrow

Change get_row() into row()

Author: coolreader18

bytecode/src/bytecode.rs

@@ -20,11 +20,11 @@ impl Location {
         Location { row, column }
     }
 
-    pub fn get_row(&self) -> usize {
+    pub fn row(&self) -> usize {
         self.row
     }
 
-    pub fn get_column(&self) -> usize {
+    pub fn column(&self) -> usize {
         self.column
     }
 }

compiler/src/compile.rs

@@ -1803,7 +1803,7 @@ impl Compiler {
     }
 
     fn get_source_line_number(&mut self) -> usize {
-        self.current_source_location.get_row()
+        self.current_source_location.row()
     }
 
     fn create_qualified_name(&self, name: &str, suffix: &str) -> String {
@@ -1835,7 +1835,7 @@ fn get_doc(body: &[ast::LocatedStatement]) -> (&[ast::LocatedStatement], Option<
 }
 
 fn compile_location(location: &ast::Location) -> bytecode::Location {
-    bytecode::Location::new(location.get_row(), location.get_column())
+    bytecode::Location::new(location.row(), location.column())
 }
 
 fn compile_varargs(varargs: &ast::Varargs) -> bytecode::Varargs {

compiler/src/error.rs

@@ -56,7 +56,7 @@ impl fmt::Display for CompileError {
         }?;
 
         // Print line number:
-        write!(f, " at line {:?}", self.location.get_row())
+        write!(f, " at line {:?}", self.location.row())
     }
 }
 

parser/src/lexer.rs

@@ -85,11 +85,11 @@ impl Location {
         Location { row, column }
     }
 
-    pub fn get_row(&self) -> usize {
+    pub fn row(&self) -> usize {
         self.row
     }
 
-    pub fn get_column(&self) -> usize {
+    pub fn column(&self) -> usize {
         self.column
     }
 }

vm/src/frame.rs

@@ -298,7 +298,7 @@ impl Frame {
                     trace!("Adding to traceback: {:?} {:?}", traceback, lineno);
                     let raise_location = vm.ctx.new_tuple(vec![
                         vm.ctx.new_str(filename.clone()),
-                        vm.ctx.new_int(lineno.get_row()),
+                        vm.ctx.new_int(lineno.row()),
                         vm.ctx.new_str(run_obj_name.clone()),
                     ]);
                     objlist::PyListRef::try_from_object(vm, traceback)?.append(raise_location, vm);

vm/src/stdlib/ast.rs

@@ -205,7 +205,7 @@ fn statement_to_ast(
     }?;
 
     // set lineno on node:
-    let lineno = vm.ctx.new_int(statement.location.get_row());
+    let lineno = vm.ctx.new_int(statement.location.row());
     vm.set_attr(node.as_object(), "lineno", lineno).unwrap();
 
     Ok(node)

vm/src/vm.rs

@@ -252,7 +252,7 @@ impl VirtualMachine {
     pub fn new_syntax_error(&self, error: &CompileError) -> PyObjectRef {
         let syntax_error_type = self.ctx.exceptions.syntax_error.clone();
         let syntax_error = self.new_exception(syntax_error_type, error.to_string());
-        let lineno = self.new_int(error.location.get_row());
+        let lineno = self.new_int(error.location.row());
         self.set_attr(&syntax_error, "lineno", lineno).unwrap();
         syntax_error
     }

wasm/lib/src/vm_class.rs

@@ -289,29 +289,20 @@ impl WASMVirtualMachine {
                         | ParseError::InvalidToken(ref loc)
                         | ParseError::UnrecognizedToken((ref loc, ..), _) = parse_error
                         {
-                            let _ = Reflect::set(
-                                &js_err,
-                                &"row".into(),
-                                &(loc.get_row() as u32).into(),
-                            );
-                            let _ = Reflect::set(
-                                &js_err,
-                                &"col".into(),
-                                &(loc.get_column() as u32).into(),
-                            );
+                            let _ =
+                                Reflect::set(&js_err, &"row".into(), &(loc.row() as u32).into());
+                            let _ =
+                                Reflect::set(&js_err, &"col".into(), &(loc.column() as u32).into());
                         }
                         if let ParseError::ExtraToken((_, _, ref loc))
                         | ParseError::UnrecognizedToken((_, _, ref loc), _) = parse_error
                         {
-                            let _ = Reflect::set(
-                                &js_err,
-                                &"endrow".into(),
-                                &(loc.get_row() as u32).into(),
-                            );
+                            let _ =
+                                Reflect::set(&js_err, &"endrow".into(), &(loc.row() as u32).into());
                             let _ = Reflect::set(
                                 &js_err,
                                 &"endcol".into(),
-                                &(loc.get_column() as u32).into(),
+                                &(loc.column() as u32).into(),
                             );
                         }
                     }