Skip to content

Commit

Permalink
Coding style changes
Browse files Browse the repository at this point in the history
Hey, also, when moving large blocks of code, the copyright notices
should be preserved.
  • Loading branch information
linas committed Dec 22, 2014
1 parent 14ef8a8 commit c5d3e18
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
14 changes: 8 additions & 6 deletions opencog/nlp/lg-dict/LGDictReader.cc
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/*
* LGDictReader.cc
*
* Copyright (c) 2012, 2013 Linas Vepstas <[email protected]>
* Copyright (C) 2014 OpenCog Foundation
*
* Author: William Ma <https://github.com/williampma>
* Author: Linas Vepstas <[email protected]>
* William Ma <https://github.com/williampma>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License v3 as
Expand Down Expand Up @@ -32,7 +34,7 @@ using namespace opencog;
* @param pAS the AtomSpace where atoms will be created
*/
LGDictReader::LGDictReader(Dictionary pDict, AtomSpace* pAS)
: m_pDictionary(pDict), m_pScmEval(new SchemeEval(pAS))
: _dictionary(pDict), _scm_eval(new SchemeEval(pAS))
{

}
Expand All @@ -42,7 +44,7 @@ LGDictReader::LGDictReader(Dictionary pDict, AtomSpace* pAS)
*/
LGDictReader::~LGDictReader()
{
delete m_pScmEval;
delete _scm_eval;
}

/**
Expand Down Expand Up @@ -70,7 +72,7 @@ LGDictReader::~LGDictReader()
Handle LGDictReader::getAtom(const std::string& word)
{
// See if we know about this word, or not.
Dict_node* dn_head = dictionary_lookup_list(m_pDictionary, word.c_str());
Dict_node* dn_head = dictionary_lookup_list(_dictionary, word.c_str());

if (!dn_head)
return Handle::UNDEFINED;
Expand All @@ -96,9 +98,9 @@ Handle LGDictReader::getAtom(const std::string& word)

set += ")\n";

free_lookup_list(m_pDictionary, dn_head);
free_lookup_list(_dictionary, dn_head);

return m_pScmEval->eval_h(set);
return _scm_eval->eval_h(set);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions opencog/nlp/lg-dict/LGDictReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ class LGDictReader
private:
std::string lg_exp_to_scm_string(Exp*);

Dictionary m_pDictionary;
SchemeEval* m_pScmEval;
Dictionary _dictionary;
SchemeEval* _scm_eval;
};

}
Expand Down

0 comments on commit c5d3e18

Please sign in to comment.